Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: simplify file revision comparison logic | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: make locally-added file test more correct | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: drop unused diverge initialization | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: refactor some initialization, drop backwards var | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: combine a copy and move case | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: drop a flag update case | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: combine three identical 'remote is newer' cases | changeset | files |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: drop 'remote deleted' case | changeset | files |