| Mon, 24 Feb 2020 16:59:35 -0500 |
Matt Harbison |
tests: stabilize test-rename-merge2.t on Windows
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 13:29:26 -0800 |
Martin von Zweigbergk |
merge: when rename was made on both sides, use ancestor as merge base
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
file |
diff |
annotate
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
file |
diff |
annotate
|
| Mon, 15 Apr 2019 14:09:18 -0700 |
Martin von Zweigbergk |
copies: delete debug message about "unmatched files new in both"
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Mon, 15 Apr 2019 16:41:43 -0700 |
Martin von Zweigbergk |
copies: fix up "fullcopy" with missing entries from "copy"
|
file |
diff |
annotate
|
| Mon, 15 Apr 2019 15:28:41 -0700 |
Martin von Zweigbergk |
tests: delete unused function in test-rename-merge2.t
|
file |
diff |
annotate
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
file |
diff |
annotate
|
| Tue, 04 Sep 2018 17:33:22 +0300 |
Pulkit Goyal |
py3: write the file in str mode in tests/test-rename-merge2.t
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
file |
diff |
annotate
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
file |
diff |
annotate
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
file |
diff |
annotate
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
file |
diff |
annotate
|
| Tue, 20 Jun 2017 17:31:18 -0400 |
Augie Fackler |
tests: clean up even more direct `python` calls with $PYTHON
|
file |
diff |
annotate
|
| Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
file |
diff |
annotate
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Tue, 20 Sep 2016 23:48:08 +0000 |
timeless |
localrepo: use single quotes in use warning
|
file |
diff |
annotate
|
| 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
|