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.
merge: warning: conflicts during mergemerging amerging a failed!32e80765d7fe+75234512624c+ tipsomething else=======somethingM a