view tests/test-mq-qimport.out @ 7785:660c8dd44060

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.

% qimport non-existing-file
abort: unable to read non-existing-file
% import URL
adding url.diff to series file
url.diff
% import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
now at: url.diff
foo
patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
now at: url.diff
foo2
patch queue now empty
% build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
now at: b.diff