Mon, 08 Jun 2009 18:14:44 -0500 merge: simplify a delete case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8738
merge: simplify a delete case
Mon, 08 Jun 2009 18:14:44 -0500 merge: reorder get cases for future simplification
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8737
merge: reorder get cases for future simplification
Mon, 08 Jun 2009 18:14:44 -0500 merge: fix prompt keep
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8736
merge: fix prompt keep
Mon, 08 Jun 2009 18:14:44 -0500 merge: remove a flags case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8735
merge: remove a flags case
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip