| Mon, 07 Dec 2015 20:43:24 -0800 | Martin von Zweigbergk | merge: refuse update/merge if there are unresolved conflicts (BC) | file | diff | annotate |
| Tue, 10 Nov 2015 16:25:59 -0800 | Christian Delahousse | filemerge: choose where .orig files are kept | file | diff | annotate |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge | file | diff | annotate |
| Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) | file | diff | annotate |
| Thu, 16 Sep 2010 17:51:32 -0500 | Matt Mackall | tests: add exit codes to unified tests | file | diff | annotate |
| Sat, 11 Sep 2010 21:19:12 +0200 | Adrian Buehlmann | tests: unify test-merge-local | file | diff | annotate | base |