log mercurial/merge.py @ 4417:0912d8df5e19

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