7 Commits

Author	SHA1	Message	Date
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
Lee Cantey	1f2673b393	Fix for merge changes introduced in rev 397091458855	2009-03-19 10:25:13 -07:00
Mads Kiilerich	21fd26f154	test-merge-tools: test ui.merge functionality and selection of internal tools	2009-03-09 18:44:44 +01:00
Augie Fackler	bf90b0cbb4	merge: better error messages to lead users to hg update --clean to abandon merges. ... Fixes issue1533.	2009-03-04 13:06:16 -06: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	d775f5aa2a	Make util.find_exe alway returns existing file, fixing issue1459 ... It seems like the old behaviour with different handling for commands with and without path was intended, but I think this behaviour of util.find_exe is better: * Always returns existing file * or None if command not found - no default * Windows: Returned file thus always ends with extension from PATHEXT This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might fix other unintended behaviour too.	2009-01-25 21:20:13 +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