view tests/test-inotify.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.

adding a
adding b
adding c
adding d
adding dir/bar/foo
adding dir/x
adding dir/y
adding e
% inserve
? hg.pid
% clean
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
% all
? hg.pid
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
% path patterns
M dir/x
? hg.pid
M dir/x
M x