Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8753
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8752
merge: simplify file revision comparison logic
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8751
merge: make locally-added file test more correct
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8750
merge: drop unused diverge initialization
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8749
merge: refactor some initialization, drop backwards var
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8748
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8747
merge: drop a flag update case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8746
merge: combine three identical 'remote is newer' cases
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8745
merge: drop 'remote deleted' case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8744
merge: simplify 'other deleted' case