[PATCH] test-merge-tools: Don't use tac

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1234278708 -3600
# Node ID 282ec5a1e916fb43c8b756b5c18638031ca2d165
# Parent  5f7512f680cb9006f730eb851fa49f42237e9aaf
test-merge-tools: Don't use tac

"tac" was a bad tool - is not available on all platforms.

The test now only uses the "tools" true, false, head, echo, cat and /bin/cat

diff --git a/tests/test-merge-tools b/tests/test-merge-tools
--- a/tests/test-merge-tools
+++ b/tests/test-merge-tools
@@ -92,8 +92,8 @@
 echo Tool selection and merge-patterns
 echo
 
-echo "# merge-patterns specifies new tool tac:"
-domerge -r 2 --config merge-patterns.f=tac
+echo "# merge-patterns specifies new tool false:"
+domerge -r 2 --config merge-patterns.f=false
 
 echo "# merge-patterns specifies executable not found in PATH and gets warning:"
 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
diff --git a/tests/test-merge-tools.out b/tests/test-merge-tools.out
--- a/tests/test-merge-tools.out
+++ b/tests/test-merge-tools.out
@@ -175,27 +175,23 @@
 
 Tool selection and merge-patterns
 
-# merge-patterns specifies new tool tac:
+# merge-patterns specifies new tool false:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
-# hg merge -r 2 --config merge-patterns.f=tac
-space
-revision 1
-space
-revision 0
-space
-revision 2
+# hg merge -r 2 --config merge-patterns.f=false
 merging f
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+merging f failed!
+0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+use 'hg resolve' to retry unresolved file merges
 # cat f
 revision 1
 space
 # hg stat
 M f
+? f.orig
 
 # merge-patterns specifies executable not found in PATH and gets warning:
 [merge-tools]