Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
To run the tests, do:cd tests/python run-tests.pySee http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests formore information on writing tests.