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 3121
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 3120
merge: simplify prompt code
Sun, 17 Sep 2006 20:38:02 -0500 merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3119
merge: simplify exec flag handling
Sun, 17 Sep 2006 20:18:27 -0500 merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3118
merge: simplify tests for local changed/remote deleted
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 tip