Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
% should failabort: path contains illegal component: .hg/00changelog.iadding a/a% should failabort: path 'b/b' traverses symbolic link 'b'% should succeed% should still fail - maybeabort: path 'b/b' traverses symbolic link 'b'