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.
default = "changelog"
header = header-rss.tmpl
changelog = changelog-rss.tmpl
changelogentry = changelogentry-rss.tmpl
filelog = filelog-rss.tmpl
filelogentry = filelogentry-rss.tmpl
tags = tags-rss.tmpl
tagentry = tagentry-rss.tmpl