tests/test-extra-filelog-entry.out

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

adding b
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 1e88685f5dde 000000000000 000000000000