--- a/tests/test-merge-tools.out Sun Jan 25 21:20:11 2009 +0100
+++ b/tests/test-merge-tools.out Sun Jan 25 21:20:13 2009 +0100
@@ -117,7 +117,6 @@
true.priority=1
# hg update -C 1
# hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool
-sh: /bin/nonexistingmergetool: No such file or directory
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -224,7 +223,7 @@
true.executable=cat
# hg update -C 1
# hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool
-sh: /bin/nonexistingmergetool: No such file or directory
+couldn't find merge tool true specified for f
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved