| Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 23:07:35 -0800 |
Martin von Zweigbergk |
tests: also test spaces in conflict marker labels
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Mon, 22 Mar 2021 13:14:11 -0700 |
Martin von Zweigbergk |
tests: replace some `python` by `"$PYTHON"` to not only use Python 2
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 12:16:55 -0800 |
Martin von Zweigbergk |
errors: use exit code 40 for when a hook fails
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
file |
diff |
annotate
|
| Thu, 29 Oct 2020 13:54:25 +0100 |
Dan Villiom Podlaski Christiansen |
commit: warn the user when a commit already exists
|
file |
diff |
annotate
|
| Wed, 11 Dec 2019 19:42:05 -0800 |
Kyle Lippincott |
merge: add commands.merge.require-rev to require an argument to hg merge
|
file |
diff |
annotate
|
| Fri, 29 Nov 2019 18:49:59 +0100 |
Julien Cristau |
test: don't put $BINDIR in $PATH for test-merge-tools.t
stable
|
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
|
| Sat, 03 Nov 2018 20:50:04 -0400 |
Matt Harbison |
tests: conditonalize a difference in test-merge-tools.t on Windows
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
file |
diff |
annotate
|
| Wed, 31 Oct 2018 19:12:32 +0100 |
Boris Feld |
test: also deactivate `ui.merge` when testing merge tool
|
file |
diff |
annotate
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
file |
diff |
annotate
|
| Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
file |
diff |
annotate
|
| Sat, 18 Aug 2018 23:39:26 -0400 |
Matt Harbison |
tests: stabilize test-merge-tools.t on Windows
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
file |
diff |
annotate
|
| Mon, 23 Jul 2018 22:51:53 -0700 |
Martin von Zweigbergk |
mergetool: warn if ui.merge points to nonexistent tool
|
file |
diff |
annotate
|
| Mon, 23 Jul 2018 22:51:50 -0700 |
Martin von Zweigbergk |
tests: demonstrate that no requested merge tool is ignored if missing
|
file |
diff |
annotate
|
| Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
file |
diff |
annotate
|
| Thu, 17 May 2018 21:55:00 +0900 |
Yuya Nishihara |
test-merge-tools: create repo directory to free $TESTTMP for temporary files
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 12:36:29 -0700 |
Kyle Lippincott |
filemerge: make the 'local' path match the format that 'base' and 'other' use
|
file |
diff |
annotate
|
| Tue, 20 Mar 2018 21:10:29 -0400 |
Matt Harbison |
test-merge-tools: stabilize for Windows
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 19:07:58 -0800 |
Kyle Lippincott |
filemerge: use a single temp dir instead of temp files
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 16:23:03 -0500 |
Augie Fackler |
tests: stop over-specifying tempfile name
|
file |
diff |
annotate
|
| Sun, 11 Feb 2018 20:59:35 -0500 |
Matt Harbison |
test-merge-tools: stabilize for Windows
|
file |
diff |
annotate
|
| Fri, 09 Feb 2018 13:18:17 +0100 |
Boris Feld |
test: glob the temporary directory out of temporary file path
|
file |
diff |
annotate
|