| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Sat, 01 Apr 2017 14:48:39 -0400 |
Matt Harbison |
tests: add globs for Windows
|
| Tue, 31 Jan 2017 03:25:59 +0100 |
Mads Kiilerich |
merge: fix crash on criss cross merge with dir move and delete (issue5020)
stable
|
| Tue, 31 Jan 2017 03:20:07 +0100 |
Mads Kiilerich |
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
stable
|
| Tue, 02 Feb 2016 15:24:11 +0000 |
Pierre-Yves David |
update: change default destination to tipmost descendant (issue4673) (BC)
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
| Thu, 11 Dec 2014 20:56:53 -0800 |
Martin von Zweigbergk |
merge: let bid merge work on the file->action dict
|
| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
| Wed, 01 Oct 2014 03:42:00 +0200 |
Mads Kiilerich |
merge: mute the status message when bid merge kicks in
|
