tests/test-empty-dir.out

Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present