##// 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:

r13964:616ad3f6 default
r15619:6c8573dd default
Show More
changelog.tmpl
41 lines | 1.3 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: Changelog</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
href="{url}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<form action="{url}log">
{sessionvars%hiddenformentry}
<div class="search">
<input type="text" name="rev" />
</div>
</form>
<div class="page_nav">
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url}shortlog/{rev}{sessionvars%urlparameter}">shortlog</a> |
changelog |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
Augie Fackler
web: add a help view for getting hg help output
r12666 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <br/>
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 {changenav%nav}<br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
{entries%changelogentry}
<div class="page_nav">
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 {changenav%nav}<br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
{footer}