##// END OF EJS Templates
copies: distinguish between merged and touched files during upgrade...
copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

File last commit:

r32758:cba4461a default
r47571:433cef8f default
Show More
help.tmpl
34 lines | 920 B | application/x-cheetah | CheetahLexer
Augie Fackler
web: add a help view for getting hg help output
r12666 {header}
<title>Help: {topic}</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
Augie Fackler
web: add a help view for getting hg help output
r12666 </div>
<ul>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
<li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Augie Fackler
web: add a help view for getting hg help output
r12666 </ul>
<ul>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li class="active"><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler
web: add a help view for getting hg help output
r12666 </ul>
</div>
<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Augie Fackler
web: add a help view for getting hg help output
r12666 <h3>Help: {topic}</h3>
Gregory Szorc
hgweb: consolidate search form for paper...
r32758 {searchform}
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <div id="doc">
{rstdoc(doc, "html")}
</div>
Augie Fackler
web: add a help view for getting hg help output
r12666 </div>
</div>
{footer}