Sun, 17 Sep 2006 21:27:30 -0500 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3121
merge: simplify actions with helper function
Sun, 17 Sep 2006 21:11:26 -0500 merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3120
merge: simplify local created logic
Sun, 17 Sep 2006 20:43:06 -0500 merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3119
merge: simplify prompt code
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip