| Thu, 10 Apr 2008 15:02:24 -0500 | Matt Mackall | merge: introduce mergestate | file | diff | annotate |
| Fri, 21 Mar 2008 11:06:02 +0100 | Dirkjan Ochtman | warn about new heads on commit (issue842) | file | diff | annotate |
| Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: allow smarter tool configuration | file | diff | annotate |
| Thu, 04 Oct 2007 19:44:37 -0500 | Matt Mackall | merge: add debug diagnostics for findcopies | file | diff | annotate |
| Tue, 30 Jan 2007 19:09:08 -0200 | Alexis S. L. Carvalho | filecommit: don't forget the local parent on a merge with a local rename | file | diff | annotate |