| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
| Fri, 13 Dec 2019 11:32:36 +0100 |
Pierre-Yves David |
test: document test-copy-move-merge.t
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Sun, 03 Sep 2017 02:34:01 +0530 |
Pulkit Goyal |
copytrace: move the default copytracing algorithm in a new function
|
| Sun, 03 Sep 2017 01:52:19 +0530 |
Pulkit Goyal |
copytrace: replace experimental.disablecopytrace config with copytrace (BC)
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
| 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
|
| Wed, 26 Dec 2012 15:03:58 -0800 |
Siddharth Agarwal |
copies: make debug messages more sensible
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| 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
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Tue, 19 Apr 2011 12:04:44 +0200 |
Martin Geisler |
tests: remove redundant mkdir
|
| Thu, 02 Sep 2010 23:22:51 +0200 |
Martin Geisler |
tests: remove unneeded -d flags
|
| Wed, 18 Aug 2010 04:26:20 +0530 |
Pradeepkumar Gayam |
tests: unify test-copy-move-merge
base
tests/test-copy-move-merge@b637a4ef03ec
|
