Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
Sat, 03 Nov 2018 20:50:04 -0400 |
Matt Harbison |
tests: conditonalize a difference in test-merge-tools.t on Windows
|
Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
Wed, 31 Oct 2018 19:12:32 +0100 |
Boris Feld |
test: also deactivate `ui.merge` when testing merge tool
|
Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
Sat, 18 Aug 2018 23:39:26 -0400 |
Matt Harbison |
tests: stabilize test-merge-tools.t on Windows
|
Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
Mon, 23 Jul 2018 22:51:53 -0700 |
Martin von Zweigbergk |
mergetool: warn if ui.merge points to nonexistent tool
|
Mon, 23 Jul 2018 22:51:50 -0700 |
Martin von Zweigbergk |
tests: demonstrate that no requested merge tool is ignored if missing
|
Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
Thu, 17 May 2018 21:55:00 +0900 |
Yuya Nishihara |
test-merge-tools: create repo directory to free $TESTTMP for temporary files
|
Wed, 21 Mar 2018 12:36:29 -0700 |
Kyle Lippincott |
filemerge: make the 'local' path match the format that 'base' and 'other' use
|
Tue, 20 Mar 2018 21:10:29 -0400 |
Matt Harbison |
test-merge-tools: stabilize for Windows
|
Fri, 19 Jan 2018 19:07:58 -0800 |
Kyle Lippincott |
filemerge: use a single temp dir instead of temp files
|
Sun, 04 Mar 2018 16:23:03 -0500 |
Augie Fackler |
tests: stop over-specifying tempfile name
|
Sun, 11 Feb 2018 20:59:35 -0500 |
Matt Harbison |
test-merge-tools: stabilize for Windows
|
Fri, 09 Feb 2018 13:18:17 +0100 |
Boris Feld |
test: glob the temporary directory out of temporary file path
|
Wed, 17 Jan 2018 17:35:05 -0800 |
Kyle Lippincott |
filemerge: support passing labels to external merge tools
|
Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
Sat, 13 May 2017 03:37:50 +0900 |
FUJIWARA Katsunori |
debugcommands: add debugpickmergetool to examine which merge tool is chosen
|
Sat, 13 May 2017 03:31:42 +0900 |
FUJIWARA Katsunori |
filemerge: add internal merge tool to dump files forcibly
|
Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: make warning message more i18n friendly
|
Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: show warning about choice of :prompt only at an actual fallback
|
Wed, 23 Nov 2016 23:47:38 +0100 |
Mads Kiilerich |
merge: use original file extension for temporary files
|
Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|