# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1242938618 -7200
# Node ID 9a4fe59b1eca3f2d92669a9b53fe484e8e2c99fe
# Parent  6419bc7b3d9cf10307df8423f844d556f56d2cfa
test-merge-tools: windows fixes

- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it

diff -r 6419bc7b3d9c -r 9a4fe59b1eca tests/test-merge-tools
--- 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
diff -r 6419bc7b3d9c -r 9a4fe59b1eca tests/test-merge-tools.out
--- 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