| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
| Fri, 09 Jan 2015 18:38:02 +0100 |
Mads Kiilerich |
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
|
| Sat, 11 Oct 2014 14:05:09 -0500 |
Matt Mackall |
dirstate: merge falls through to otherparent
|
| Fri, 10 Oct 2014 13:31:06 -0500 |
Matt Mackall |
dirstate: use 'm' state in otherparent to reduce ambiguity
|
| Mon, 10 Feb 2014 00:43:54 +0100 |
Mads Kiilerich |
merge: don't overwrite file untracked after remove, abort with 'untracked files'
stable
|
| Sun, 12 Sep 2010 12:11:39 +0200 |
Adrian Buehlmann |
tests: unify test-merge-remove
base
tests/test-merge-remove@d4b54bb45926
|
