Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: add support for tool EOL fixups | changeset | files |
Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: allow smarter tool configuration | changeset | files |
Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | filemerge: pull file-merging code into its own module | changeset | files |
Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: move the bulk of simplemerge into core | changeset | files |