##// END OF EJS Templates
mergetools: avoid losing the merged version with meld...
mergetools: avoid losing the merged version with meld Add -o $output. When using Meld as intended (merge from left and right into the center panel), the merged version is written to the wrong file without this option ($base, a temporary file, which is ignored by Mercurial). Add meld.check=changed as a secondary safety net.

File last commit:

r18526:9409aeaa stable
r18971:c4266e9a default
Show More
bookmarks.tmpl
55 lines | 1.6 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: bookmarks</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks" />
<link rel="alternate" type="application/rss+xml"
href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks" />
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="{logourl}">
<img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
</div>
<ul>
<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 class="active">bookmarks</li>
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
</ul>
<ul>
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
<p>
<div class="atom-logo">
<a href="{url|urlescape}atom-bookmarks" title="subscribe to atom feed">
<img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">
</a>
</div>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>bookmarks</h3>
<form class="search" action="{url|urlescape}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>
<th>bookmark</th>
<th>node</th>
</tr>
{entries%bookmarkentry}
</table>
</div>
</div>
{footer}