Mercurial > hg
view mercurial/templates/rss/error.tmpl @ 26572:c7850af6bb75
filemerge._merge: drop no longer necessary 'if r:' check
Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Oct 2015 14:16:19 -0700 |
parents | 4b0fc75f9403 |
children |
line wrap: on
line source
{header} <title>Error</title> <description>Error</description> <item> <title>Error</title> <description>{error|escape}</description> <guid>https://mercurial-scm.org/#error</guid> </item> </channel> </rss>