Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-tools
changeset 8539 9a4fe59b1eca
parent 7846 1cb6836946be
child 8674 0941ee76489e 
--- a/tests/test-merge-tools	Thu May 21 20:59:36 2009 +0200
+++ b/tests/test-merge-tools	Thu May 21 22:43:38 2009 +0200
@@ -88,8 +88,7 @@
 domerge -r 2
 
 echo "# and true.executable set to cat with path works:"
-domerge -r 2 --config merge-tools.true.executable=/bin/cat
-
+domerge -r 2 --config merge-tools.true.executable=cat
 
 echo
 echo Tool selection and merge-patterns
@@ -168,4 +167,4 @@
 echo
 
 echo "# cat is a bad merge-tool and doesn't change:"
-domerge -r 2 --config merge-tools.true.checkchanged=1
+domerge -y -r 2 --config merge-tools.true.checkchanged=1
mercurial