view mercurial/templates/paper/filecomparison.tmpl @ 38220:ad50f0399e1e

graft: correct documentation about options can be reapplied Now options --user and --date can be reapplied after we hit a conflict. Differential Revision: https://phab.mercurial-scm.org/D3678
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 02 Jun 2018 15:55:28 +0530
parents 9acc0360ff67
children
line wrap: on
line source

{header}
<title>{repo|escape}: {file|escape} comparison</title>
</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/{symrev}{sessionvars%urlparameter}">log</a></li>
<li><a href="{url|urlescape}graph/{symrev}{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>
</ul>
<ul>
<li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
<li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
</ul>
<ul>
<li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
<li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
<li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
<li class="active">comparison</li>
<li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
<li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
<li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
</ul>
<ul>
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
</div>

<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>
 comparison {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
 {alltags}
</h3>

{searchform}

<div class="description">{desc|strip|escape|websub|nonempty}</div>

<table id="changesetEntry">
<tr>
 <th>author</th>
 <td>{author|obfuscate}</td>
</tr>
<tr>
 <th>date</th>
 <td class="date age">{date|rfc822date}</td>
</tr>
<tr>
 <th>parents</th>
 <td>{parent%filerevparent}</td>
</tr>
<tr>
 <th>children</th>
 <td>{child%filerevchild}</td>
</tr>
</table>

<div class="overflow">
<div class="sourcefirst">   comparison</div>
<div class="legend">
  <span class="legendinfo equal">equal</span>
  <span class="legendinfo delete">deleted</span>
  <span class="legendinfo insert">inserted</span>
  <span class="legendinfo replace">replaced</span>
</div>

<table class="bigtable">
  <thead class="header">
    <tr>
      <th>{leftrev}:{leftnode|short}</th>
      <th>{rightrev}:{rightnode|short}</th>
    </tr>
  </thead>
  {comparison}
</table>

</div>
</div>
</div>

{footer}