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.

Content-type: text/xml

<rss version="2.0">
  <channel>
    <link>#url#</link>
    <language>en-us</language>