Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tools: windows fixes
authorPatrick Mezard <pmezard@gmail.com>
Thu, 21 May 2009 22:43:38 +0200
changeset 8539 9a4fe59b1eca
parent 8538 6419bc7b3d9c
child 8540 f0733f11b566
test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it
tests/test-merge-tools file | annotate | diff | comparison | revisions
tests/test-merge-tools.out file | annotate | diff | comparison | revisions 
--- 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
--- a/tests/test-merge-tools.out	Thu May 21 20:59:36 2009 +0200
+++ b/tests/test-merge-tools.out	Thu May 21 22:43:38 2009 +0200
@@ -156,7 +156,7 @@
 true.priority=1
 true.executable=cat
 # hg update -C 1
-# hg merge -r 2 --config merge-tools.true.executable=/bin/cat
+# hg merge -r 2 --config merge-tools.true.executable=cat
 revision 1
 space
 revision 0
@@ -459,7 +459,7 @@
 true.priority=1
 true.executable=cat
 # hg update -C 1
-# hg merge -r 2 --config merge-tools.true.checkchanged=1
+# hg merge -y -r 2 --config merge-tools.true.checkchanged=1
 revision 1
 space
 revision 0
mercurial