##// END OF EJS Templates
merge: make internal merge fail cleanly on symlinks...
merge: make internal merge fail cleanly on symlinks Simplemerge is not symlink aware and will never do the the right thing on symlinks. It would read the symlink as a file and abort with 'No such file or directory' on dangling symlinks. Instead, internal:merge now simply fails to merge symlinks.

File last commit:

r18194:18fef986 stable
r18256:d084df89 default
Show More
helptopics.tmpl
45 lines | 1.3 KiB | application/x-cheetah | CheetahLexer
Augie Fackler
web: add a help view for getting hg help output
r12666 {header}
<title>Help: {title}</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}">
Angel Ezquerra
hgweb: add a "web/logoimg" setting to customize the web logo image...
r14913 <img src="{staticurl}{logoimg}" alt="mercurial" /></a>
Augie Fackler
web: add a help view for getting hg help output
r12666 </div>
<ul>
<li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
<li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
Augie Fackler
web: add a help view for getting hg help output
r12666 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
</ul>
<ul>
<li class="active">help</li>
</ul>
</div>
<div class="main">
<h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
<form class="search" action="{url}log">
{sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
<table class="bigtable">
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
{topics % helpentry}
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
</table>
</div>
</div>
{footer}