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.

     1

#header#

     2

    <title>#repo|escape# Changelog</title>

     3

    <description>#repo|escape# Changelog</description>

     4

    #entries%changelogentry#

     5

  </channel>

     6

</rss>