templates/filelog-rss.tmpl
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 599 765182a4c843
child 985 7ffa91f275ff
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

#header#
    <title>#repo|escape#: #file# history</title>
    <description>#file# revision history</description>
    #entries#
  </channel>
</rss>