Mon, 08 Jun 2009 18:21:13 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:21:13 -0500] rev 8755
Merge with stable
Mon, 08 Jun 2009 18:16:32 -0500 Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:16:32 -0500] rev 8754
Merge with crew
Mon, 08 Jun 2009 18:14:44 -0500 merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8753
merge: refactor manifestmerge init to better report effective ancestor
Mon, 08 Jun 2009 18:14:44 -0500 merge: simplify file revision comparison logic
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8752
merge: simplify file revision comparison logic
Mon, 08 Jun 2009 18:14:44 -0500 merge: make locally-added file test more correct
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8751
merge: make locally-added file test more correct
Mon, 08 Jun 2009 18:14:44 -0500 merge: drop unused diverge initialization
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8750
merge: drop unused diverge initialization
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip