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
|