Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 4486:c15955bde7dd
age | author | description |
---|---|---|
Tue, 08 May 2007 11:42:48 -0500 | Matt Mackall | Merge with stable |
Tue, 08 May 2007 02:59:13 -0500 | Matt Mackall | merge: fix spurious merges for copies in linear updates |
Sun, 06 May 2007 20:27:45 -0700 | Brendan Cully | Add fast-forward branch merging |
Thu, 03 May 2007 17:27:21 -0500 | Matt Mackall | Merge with stable |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: reorganize some hunks in findcopies |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: simplify a check in checkcopies |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: expand and simplify the invalid handling for directory moves |