| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) | file | diff | annotate |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge | file | diff | annotate |
| Thu, 17 Apr 2014 22:47:38 +0200 | Mads Kiilerich | spelling: fixes from proofreading of spell checker issues | file | diff | annotate |
| Wed, 26 Nov 2014 11:45:21 -0800 | Martin von Zweigbergk | merge: add more thorough tests for --force | file | diff | annotate |
| Mon, 23 Sep 2013 20:50:51 -0700 | Siddharth Agarwal | merge: standardize error message for dirty working dir | file | diff | annotate |
| Wed, 07 Dec 2011 11:23:01 -0600 | Kevin Bullock | merge: make 'nothing to merge' aborts consistent | 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 17:58:37 +0200 | Adrian Buehlmann | tests: unify test-merge-force | file | diff | annotate | base |