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.

#header#
# HG changeset patch
# User #author#
# Date #date|date#
# Node ID #node#
#parent%changesetparent#
#desc#

#diff#