Tue, 15 Aug 2006 16:12:51 -0500 merge: working manifest new/changed
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2893
merge: working manifest new/changed To remove dependence on m1 during manifest comparison, we distinguish between new and changed states in mw.
Tue, 15 Aug 2006 15:58:10 -0500 merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:58:10 -0500] rev 2892
merge: factor out exec bit merge function
(0) -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip