##// END OF EJS Templates
mergestate: add a constructor that sets up a clean merge state...
mergestate: add a constructor that sets up a clean merge state Eventually, we'll move the read call out of the constructor. This will: - avoid unnecessary reads when we're going to nuke the merge state anyway - avoid raising an exception if there's an unsupported merge record 'clean' seems like a good name for it because I wanted to avoid anything with the word 'new' in it, and 'reset' is more an action performed on a merge state than a way to get a new merge state. Thanks to Martin von Zweigbergk for feedback about naming this.

File last commit:

r26421:4b0fc75f default
r26987:416b2b7d default
Show More
error.tmpl
17 lines | 484 B | application/x-cheetah | CheetahLexer
{header}
<!-- Error -->
<id>{urlbase}{url|urlescape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-log"/>
<link rel="alternate" href="{urlbase}{url|urlescape}"/>
<title>Error</title>
<updated>1970-01-01T00:00:00+00:00</updated>
<entry>
<title>Error</title>
<id>https://mercurial-scm.org/#error</id>
<author>
<name>mercurial</name>
</author>
<updated>1970-01-01T00:00:00+00:00</updated>
<content type="text">{error|escape}</content>
</entry>
</feed>