| Sat, 19 Nov 2016 15:41:37 -0800 | Kostia Balytskyi | conflicts: make spacing consistent in conflict markers | file | diff | annotate |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge | file | diff | annotate |
| Mon, 26 May 2014 11:44:58 -0700 | Pierre-Yves David | merge: drop the quotes around commit description | file | diff | annotate |
| Fri, 09 May 2014 18:09:11 -0700 | Durham Goode | update: specify custom conflict markers for update (BC) | file | diff | annotate |
| Thu, 08 May 2014 16:50:22 -0700 | Durham Goode | merge: add conflict marker formatter (BC) | 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 |
| Tue, 14 Sep 2010 12:20:51 +0200 | Adrian Buehlmann | combine tests | file | diff | annotate | base |