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

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
rm .hg/requires
hg tip
echo indoor-pool > .hg/requires
hg tip

true