Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 4417:0912d8df5e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -7 tip
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
less more | (0) -100 -30 -10 -7 tip