view tests/test-debugrename @ 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
echo a > a
hg ci -Am t

hg mv a b
hg ci -Am t1
hg debugrename b

hg mv b a
hg ci -Am t2
hg debugrename a

echo % test with --rev
hg debugrename --rev 1 b