Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
Is there an error message when trying to diff non-existing files?
found: No such file or directory
not: No such file or directory
Is there an error message when trying to add non-existing files?
found: No such file or directory
not: No such file or directory