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

% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644