| Wed, 11 Dec 2019 19:42:05 -0800 |
Kyle Lippincott |
merge: add commands.merge.require-rev to require an argument to hg merge
|
| Fri, 29 Nov 2019 18:49:59 +0100 |
Julien Cristau |
test: don't put $BINDIR in $PATH for test-merge-tools.t
stable
|
| 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
|
