| Fri, 11 Apr 2008 12:52:56 -0500 | Matt Mackall | resolve: new command | file | diff | annotate |
| Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: allow smarter tool configuration | file | diff | annotate |
| Tue, 08 May 2007 11:42:48 -0500 | Matt Mackall | Merge with stable | file | diff | annotate |
| Tue, 08 May 2007 02:59:13 -0500 | Matt Mackall | merge: fix spurious merges for copies in linear updates | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default | file | diff | annotate |
| Thu, 05 Apr 2007 16:43:18 -0500 | Matt Mackall | merge: fix a bug where copies were ignored | file | diff | annotate |
| Mon, 11 Dec 2006 18:09:52 +0100 | Thomas Arendsen Hein | Add instructions how to redo/finish failed merge with local working directory. | file | diff | annotate |