Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
adding a
% check custom patch options are honored
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../a.diff
Using custom patch
nothing changed