| Wed, 23 Mar 2016 13:34:47 -0700 |
Martijn Pieters |
graphmod: set default edge styles for ascii graphs (BC)
|
| Mon, 29 Feb 2016 01:01:20 -0500 |
Matt Harbison |
tests: flag Windows specific lines about background closing as optional
|
| Wed, 23 Dec 2015 12:41:20 -0800 |
Siddharth Agarwal |
test-copy-move-merge.t: explicitly request changed version
|
| 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: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)
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
| Tue, 27 Jan 2015 11:26:27 -0800 |
Durham Goode |
copy: add flag for disabling copy tracing
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
copies: report found copies sorted
|
| Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
merge: process files in sorted order
|
