Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: drop an overwrite test | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: simplify a delete case | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: reorder get cases for future simplification | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: fix prompt keep | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: remove a flags case | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: pretend ancestor is local to simplify backwards and overwrite | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: simplify flag merging code slightly | changeset | files |