##// END OF EJS Templates
merge: make 'nothing to merge' aborts consistent...
merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

File last commit:

r15375:fe9d36a6 stable
r15619:6c8573dd default
Show More
changelogentry.tmpl
14 lines | 559 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <div>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|rfc822date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="title_text">
<div class="log_link">
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
</div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
<div class="log_body">
{desc|strip|escape|addbreaks|nonempty}
<br/>
<br/>
</div>