log mercurial/merge.py @ 4633:ff7253a0d1da

age author description
Tue, 19 Jun 2007 08:06:37 +0200 Thomas Arendsen Hein Cleanup of whitespace, indentation and line continuation.
Mon, 18 Jun 2007 12:38:54 -0700 Brendan Cully Make fast-forward merges full merges
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