--- a/tests/test-merge-tools.t Tue Oct 13 23:04:53 2015 -0700
+++ b/tests/test-merge-tools.t Wed Oct 14 12:57:33 2015 -0400
@@ -193,6 +193,26 @@
M f
? f.orig
+or true set to disabled:
+ $ beforemerge
+ [merge-tools]
+ false.whatever=
+ true.priority=1
+ # hg update -C 1
+ $ hg merge -r 2 --config merge-tools.true.disabled=yes
+ merging f
+ merging f failed!
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ [1]
+ $ aftermerge
+ # cat f
+ revision 1
+ space
+ # hg stat
+ M f
+ ? f.orig
+
or true.executable not found in PATH:
$ beforemerge