| Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: move the bulk of simplemerge into core | file | diff | annotate |
| Tue, 19 Jun 2007 08:06:37 +0200 | Thomas Arendsen Hein | Cleanup of whitespace, indentation and line continuation. | file | diff | annotate |
| Wed, 06 Jun 2007 20:22:52 +0200 | Thomas Arendsen Hein | Removed trailing whitespace and tabs from python files | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | actually port simplemerge to hg | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | Import 3-way merge code from bzr | file | diff | annotate |