##// END OF EJS Templates
mergestate: handle additional record types specially...
mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

File last commit:

r26021:b57d05ca default
r27027:a01ecbcf default
Show More
footer.tmpl
18 lines | 546 B | application/x-cheetah | CheetahLexer
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <div class="page-footer">
<p>Mercurial Repository: {repo|escape}</p>
<ul class="rss-logo">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}rss-log">RSS</a></li>
<li><a href="{url|urlescape}atom-log">Atom</a></li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>
{motd}
</div>
<div id="powered-by">
Anton Shestakov
hgweb: close <img> elements...
r23830 <p><a href="{logourl}" title="Mercurial"><img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a></p>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
</div>
</body>
</html>