Mercurial > hg

diff tests/test-merge-tools.out @ 8539:9a4fe59b1eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it
author Patrick Mezard <pmezard@gmail.com>
date Thu, 21 May 2009 22:43:38 +0200
parents e945e012d5d1
children 94319ae527cf
line wrap: on
line diff
--- 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