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

rm -rf a
hg init a
cd a
echo a > a
hg ci -Am0
hg tag t1 # 1
hg tag --remove t1 # 2

hg co 1
hg tag -r0 t1
hg tags