view templates/rss/error.tmpl @ 9468:b2310903c462

hg: say 'hg update' instead of 'hg up' in merge status message

Includes the change to the message itself, along with several test
output files that also had to change.

{header}
    <title>Error</title>
    <description>Error</description>
    <item>
      <title>Error</title>
      <description>{error|escape}</description>
      <guid>http://mercurial.selenic.com/#error</guid>
    </item>
  </channel>
</rss>