Patrick Mezard
75d91d6ef2
test-merge-tools: windows fixes
...
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it
2009-05-21 22:43:38 +02:00
Mads Kiilerich
21fd26f154
test-merge-tools: test ui.merge functionality and selection of internal tools
2009-03-09 18:44:44 +01:00
Mads Kiilerich
d6ab2f95b5
test-merge-tool: Make sure no hgmerge can be found in $PATH
...
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
2009-02-10 22:47:38 +01:00
Mads Kiilerich
9b111ad022
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
2009-02-10 16:11:48 +01:00
Mads Kiilerich
ec83cadc8e
test-merge-tools
...
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
2009-01-25 21:20:11 +01:00