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
# do we ever miss a sub-second change?
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
hg co -qC 0
echo b > a
hg st
done