view tests/test-strict @ 5503:6f26c7677463

Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.

#!/bin/sh

hg init

echo a > a
hg ci -d '0 0' -Ama

hg an a

echo "[ui]" >> $HGRCPATH
echo "strict=True" >> $HGRCPATH

hg an a
hg annotate a

echo % should succeed - up is an alias, not an abbreviation

hg up