diff -r 5bf5fd1e2a74 -r 8c06d4bf2c23 tests/test-merge-tools --- a/tests/test-merge-tools Sun Feb 15 10:50:48 2009 -0600 +++ b/tests/test-merge-tools Tue Feb 10 16:11:48 2009 +0100 @@ -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