Mercurial > hg
log tests/test-merge-remove.t @ 37753:f450a3be62ec
| age | author | description |
|---|---|---|
| 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' |