view tests/test-issue352 @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc

It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.

#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue352

"$TESTDIR/hghave" eol-in-paths || exit 80

hg init foo
cd foo

A=`printf 'he\rllo'`

echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"

echo foo > "hell
o"
hg add
hg ci -A -m m

echo foo > "$A"
hg debugwalk

exit 0