Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 5318:c6682cdada2f
age | author | description |
---|---|---|
Sun, 12 Aug 2007 12:15:10 -0300 | Alexis S. L. Carvalho | merge: fix a copy detection bug (issue672) |
Fri, 10 Aug 2007 10:46:03 -0700 | Bryan O'Sullivan | Make audit_path more stringent. |
Thu, 02 Aug 2007 13:23:53 -0500 | Matt Mackall | Merge with -stable |
Thu, 02 Aug 2007 12:29:10 -0500 | Matt Mackall | merge: avoid double deletion mentioned in issue636 |
Wed, 01 Aug 2007 14:03:48 -0500 | Matt Mackall | Merge with stable |
Wed, 01 Aug 2007 12:33:12 -0500 | Matt Mackall | merge: do early copy to deal with issue636 |
Thu, 26 Jul 2007 12:02:55 -0500 | Matt Mackall | Merge with -stable |