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

Content-type: text/xml

     2

     3

<rss version="2.0">

     4

  <channel>

     5

    <link>#url#</link>

     6

    <language>en-us</language>