| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
file |
diff |
annotate
|
| Mon, 29 Feb 2016 01:01:20 -0500 |
Matt Harbison |
tests: flag Windows specific lines about background closing as optional
|
file |
diff |
annotate
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
file |
diff |
annotate
|
| Wed, 11 Feb 2015 22:22:29 -0800 |
Martin von Zweigbergk |
test-rename-merge2: make selected output less arbitrary
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|
| Wed, 29 Apr 2015 21:14:59 -0400 |
Matt Harbison |
windows: make shellquote() quote any path containing '\' (issue4629)
stable
|
file |
diff |
annotate
|
| Fri, 17 Apr 2015 12:39:55 -0400 |
Matt Harbison |
test-rename-merge2: fix test failure on Windows
stable
|
file |
diff |
annotate
|
| Thu, 19 Mar 2015 22:22:50 +0100 |
Mads Kiilerich |
merge: better debug messages before/after invoking external merge tool
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 16:13:26 -0800 |
Martin von Zweigbergk |
merge: don't report progress for dr/rd actions
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
file |
diff |
annotate
|
| Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
file |
diff |
annotate
|
| Tue, 25 Feb 2014 20:28:40 +0100 |
Mads Kiilerich |
tests: add systematic test of merge ancestor calculation
|
file |
diff |
annotate
|
| Mon, 29 Apr 2013 15:58:15 +0900 |
FUJIWARA Katsunori |
merge: increase safety of parallel updating/removing on icasefs
stable
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:10 -0800 |
Bryan O'Sullivan |
tests: getremove test output changes (fold into previous patch)
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: don't indent "local changed %s which remote deleted" prompt
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay prompts a bit and show them in (extra) sorted order
|
file |
diff |
annotate
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
copies: report found copies sorted
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 15:03:58 -0800 |
Siddharth Agarwal |
copies: make debug messages more sensible
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Wed, 23 May 2012 21:34:29 +0200 |
Thomas Arendsen Hein |
merge: show renamed on one and deleted on the other side in debug output
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Tue, 19 Apr 2011 12:04:44 +0200 |
Martin Geisler |
tests: remove redundant mkdir
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
file |
diff |
annotate
|
| Sat, 16 Oct 2010 18:09:01 +0200 |
Adrian Buehlmann |
check-code: add 'no tab indent' check for unified tests
|
file |
diff |
annotate
|
| Sun, 26 Sep 2010 13:44:49 -0500 |
Matt Mackall |
tests: unify test-rename-merge2
|
file |
diff |
annotate
| base
|