Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

Content-type: text/xml

<rss version="2.0">
  <channel>
    <link>{urlbase}{url}</link>
    <language>en-us</language>