tests/test-issue436

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 a
cd a
hg -v log -v
hg -v log -v x
true