view tests/test-issue433 @ 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
# http://www.selenic.com/mercurial/bts/issue433

hg init a
cd a
echo a > a
hg commit -Ama

hg parents -r 0 doesnotexist
true