--- a/tests/test-merge-tools.t Thu Dec 12 09:59:03 2019 -0800
+++ b/tests/test-merge-tools.t Wed Dec 11 19:42:05 2019 -0800
@@ -4,6 +4,8 @@
$ cat >> $HGRCPATH << EOF
> [ui]
> merge=
+ > [commands]
+ > merge.require-rev=True
> EOF
$ hg init repo
$ cd repo
@@ -1908,6 +1910,7 @@
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
+(Testing that commands.merge.require-rev doesn't break --abort)
$ hg merge --abort -q
(for ui.merge, ignored unintentionally)