Mercurial > hg > mercurial-crew
diff tests/test-merge-tools @ 8539:9a4fe59b1eca
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 | 1cb6836946be |
| children | 0941ee76489e |
line wrap: on
line diff
--- a/tests/test-merge-tools +++ b/tests/test-merge-tools @@ -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