--- a/tests/test-merge-tools.t Fri Aug 17 13:58:18 2012 -0700
+++ b/tests/test-merge-tools.t Fri Aug 17 13:58:18 2012 -0700
@@ -191,7 +191,7 @@
false.whatever=
true.priority=1
# hg update -C 1
- $ hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
+ $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -212,7 +212,7 @@
false.whatever=
true.priority=1
# hg update -C 1
- $ hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
+ $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -336,7 +336,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=nonexistingmergetool
+ $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
couldn't find merge tool true specified for f
merging f
merging f failed!
@@ -359,7 +359,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=/nonexisting/mergetool
+ $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
couldn't find merge tool true specified for f
merging f
merging f failed!