Fri, 05 Dec 2014 16:13:26 -0800 |
Martin von Zweigbergk |
merge: don't report progress for dr/rd actions
|
Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
Tue, 25 Feb 2014 20:28:40 +0100 |
Mads Kiilerich |
tests: add systematic test of merge ancestor calculation
|
Mon, 29 Apr 2013 15:58:15 +0900 |
FUJIWARA Katsunori |
merge: increase safety of parallel updating/removing on icasefs
stable
|
Sat, 09 Feb 2013 15:22:10 -0800 |
Bryan O'Sullivan |
tests: getremove test output changes (fold into previous patch)
|
Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|