Tue, 08 Aug 2006 09:11:16 -0500 Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:11:16 -0500] rev 2811
Merge: combine choose and moddirstate to partial
Mon, 07 Aug 2006 23:53:04 -0500 Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:53:04 -0500] rev 2810
Rename merge.allow -> merge.branchmerge
(0) -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip