view tests/test-pull-http.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
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect error, cloning not allowed
abort: authorization failed
requesting all changes
% serve errors
% expect error, pulling not allowed
abort: authorization failed
pulling from http://localhost/
searching for changes
% serve errors