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

#!/bin/sh

hg init a
cd a
hg log
hg grep wah
hg manifest
hg verify
ls .hg
ls .hg/store

cd ..
hg clone a b
cd b
hg verify
ls .hg
ls .hg/store