##// END OF EJS Templates
resolve: don't abort resolve -l even when no merge is in progress...
resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

File last commit:

r18526:9409aeaa stable
r21541:6062593d default
Show More
header.tmpl
5 lines | 149 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link>{urlbase}{url|urlescape}</link>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <language>en-us</language>