| Mon, 30 Nov 2015 13:43:55 -0800 | Siddharth Agarwal | filemerge: add a 'leave unresolved' option to change/delete prompts | file | diff | annotate |
| Wed, 25 Nov 2015 14:25:33 -0800 | Siddharth Agarwal | merge: move almost all change/delete conflicts to resolve phase (BC) (API) | file | diff | annotate |
| Fri, 09 Jan 2015 18:38:02 +0100 | Mads Kiilerich | debugdirstate: don't hide date field with --nodate, just show 'set'/'unset' | file | diff | annotate |
| Sat, 11 Oct 2014 14:05:09 -0500 | Matt Mackall | dirstate: merge falls through to otherparent | file | diff | annotate |
| Fri, 10 Oct 2014 13:31:06 -0500 | Matt Mackall | dirstate: use 'm' state in otherparent to reduce ambiguity | file | diff | annotate |
| Mon, 10 Feb 2014 00:43:54 +0100 | Mads Kiilerich | merge: don't overwrite file untracked after remove, abort with 'untracked files' | file | diff | annotate |
| Sun, 12 Sep 2010 12:11:39 +0200 | Adrian Buehlmann | tests: unify test-merge-remove | file | diff | annotate | base |