Tue, 15 Mar 2022 13:31:39 -0700 |
Martin von Zweigbergk |
filemerge: when merge tool uses $output, don't leave markers in $local
stable
|
Tue, 15 Mar 2022 13:40:45 -0700 |
Martin von Zweigbergk |
tests: demonstrate how conflict markers end up $local *and* $output
stable
|
Fri, 18 Feb 2022 12:51:23 +0100 |
Raphaël Gomès |
windows: adjust test output in test-merge-tools.t
stable
|
Fri, 11 Feb 2022 16:52:48 -0800 |
Martin von Zweigbergk |
filemerge: put temporary files in single temp dir by default
|
Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
Thu, 20 Jan 2022 23:07:35 -0800 |
Martin von Zweigbergk |
tests: also test spaces in conflict marker labels
|
Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
Mon, 22 Mar 2021 13:14:11 -0700 |
Martin von Zweigbergk |
tests: replace some `python` by `"$PYTHON"` to not only use Python 2
|
Fri, 29 Jan 2021 12:16:55 -0800 |
Martin von Zweigbergk |
errors: use exit code 40 for when a hook fails
|
Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
Thu, 29 Oct 2020 13:54:25 +0100 |
Dan Villiom Podlaski Christiansen |
commit: warn the user when a commit already exists
|
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
|