tests/test-cat.out

hgmerge: do not use file with markers in tools merging themselves

This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.

adding a
adding b
0
0
0
a: No such file in rev 7040230c159c
1