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.
removing bthis update spans a branch affecting the following files: baborting update spanning branches!(use update -m to merge across branches or -C to lose changes)