merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.

     1

#header#

     2

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

     3

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

     4

    #entries%changelogentry#

     5

  </channel>

     6

</rss>