log mercurial/merge.py @ 9030:3f56055ff1d7

age author description
Sun, 05 Jul 2009 11:01:01 +0200 Alejandro Santos compat: can't compare two values of unequal datatypes
Mon, 15 Jun 2009 02:45:38 -0500 Matt Mackall subrepo: add update/merge logic
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor manifestmerge init to better report effective ancestor
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify file revision comparison logic
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: make locally-added file test more correct
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop unused diverge initialization
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor some initialization, drop backwards var
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: combine a copy and move case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop a flag update case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: combine three identical 'remote is newer' cases
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop 'remote deleted' case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify 'other deleted' case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify backwards revert test, ready to combine with other cases
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: allow merging going backwards
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: reorder remote creation tests