##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r32759:265196cd default
r45835:0c849f01 default
Show More
helptopics.tmpl
46 lines | 1.9 KiB | application/x-cheetah | CheetahLexer
Augie Fackler
web: add a help view for getting hg help output
r12666 {header}
av6
hgweb: fix help pages title in gitweb and monoblue...
r25686 <title>Help: {title}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
Augie Fackler
web: add a help view for getting hg help output
r12666 </head>
<body>
<div id="container">
<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
Augie Fackler
web: add a help view for getting hg help output
r12666
Gregory Szorc
hgweb: consolidate search form for monoblue...
r32759 {searchform}
Augie Fackler
web: add a help view for getting hg help output
r12666
<ul class="page-nav">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
<li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
av6
hgweb: don't point graph links at tip hash where it doesn't make sense...
r25525 <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
av6
monoblue: fix branches link on help topics page
r25872 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
av6
hgweb: don't point file links at tip hash where it doesn't make sense...
r25526 <li><a href="{url|urlescape}file{sessionvars%urlparameter}">files</a></li>
Gregory Szorc
templates: support linking to main help page...
r27580 {if(subindex,
'<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>',
'<li class="current">help</li>'
)}
Augie Fackler
web: add a help view for getting hg help output
r12666 </ul>
</div>
av6
monoblue: fix page subtitle on help pages
r26151 <h2 class="no-link no-border">help</h2>
Augie Fackler
web: add a help view for getting hg help output
r12666 <table cellspacing="0">
av6
hgweb: make anchor name actually match its href on help index page
r30019 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
Augie Fackler
web: add a help view for getting hg help output
r12666 {topics % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 {if(earlycommands, '
Augie Fackler
web: add a help view for getting hg help output
r12666 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 ')}
Augie Fackler
web: add a help view for getting hg help output
r12666
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 {if(othercommands, '
Augie Fackler
web: add a help view for getting hg help output
r12666 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 ')}
Augie Fackler
web: add a help view for getting hg help output
r12666 </table>
{footer}