##// END OF EJS Templates
merge: call hg.abortmerge() directly and return early...
merge: call hg.abortmerge() directly and return early It's seem really weird to go through a lot of unrelated code before we call `hg.merge(..., abort=True)` when we can just call `hg.abortmerge()` and return early. Differential Revision: https://phab.mercurial-scm.org/D7995

File last commit:

r30558:7817df55 stable
r44637:6744859f default
Show More
filelogentry.tmpl
7 lines | 315 B | application/x-cheetah | CheetahLexer
<item>
<title>{desc|strip|firstline|strip|escape}</title>
<link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>
<description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
<author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>