--- a/tests/test-histedit-merge-tools.t Fri Oct 23 15:59:32 2020 -0700
+++ b/tests/test-histedit-merge-tools.t Mon Oct 26 10:33:32 2020 -0700
@@ -12,8 +12,6 @@
> [extensions]
> histedit=
> mockmakedate = $TESTDIR/mockmakedate.py
- > [ui]
- > pre-merge-tool-output-template='pre-merge message for {node}\n'
> EOF
Merge conflict
@@ -21,6 +19,11 @@
$ hg init r
$ cd r
+ $ cat >> .hg/hgrc <<EOF
+ > [command-templates]
+ > pre-merge-tool-output='pre-merge message for {node}\n'
+ > EOF
+
$ echo foo > file
$ hg add file
$ hg ci -m "First" -d "1 0"
@@ -55,3 +58,26 @@
merging file
pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
7181f42b8fca: skipping changeset (no changes)
+ $ hg histedit --abort
+ abort: no histedit in progress
+ [255]
+ $ cd ..
+
+Test legacy config name
+
+ $ hg init r2
+ $ cd r2
+ $ echo foo > file
+ $ hg add file
+ $ hg ci -m "First"
+ $ echo bar > file
+ $ hg ci -m "Second"
+ $ echo conflict > file
+ $ hg co -m 0 --config ui.merge=false \
+ > --config ui.pre-merge-tool-output-template='legacy config: {node}\n'
+ merging file
+ legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7
+ merging file failed!
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges
+ [1]