--- a/tests/test-merge-tools.out	Mon Jan 25 00:05:22 2010 -0600
+++ b/tests/test-merge-tools.out	Mon Jan 25 00:05:27 2010 -0600
@@ -116,7 +116,7 @@
 false.whatever=
 true.priority=1
 # hg update -C 1
-# hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool
+# hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -218,7 +218,7 @@
 true.priority=1
 true.executable=cat
 # hg update -C 1
-# hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool
+# hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
 couldn't find merge tool true specified for f
 merging f
 merging f failed!