##// END OF EJS Templates
branching: fix wrong merge conflict resolution from 13dfad0f9f7a...
branching: fix wrong merge conflict resolution from 13dfad0f9f7a 13dfad0f9f7a merged stable into default, but accidentally added the _blockingreader class from stable (but deindented) instead of merging the changes from stable (2fe4efaa59af) into the existing _blockingreader class. This resulted in the _blockingreader being there two times.

File last commit:

r26421:4b0fc75f default
r50119:cdb85d05 default
Show More
error.tmpl
10 lines | 241 B | application/x-cheetah | CheetahLexer
{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>