Mercurial > hg
view mercurial/templates/paper/filediff.tmpl @ 19987:ba6486076429 stable
merge: move forgets to the beginning of the action list
Forgets need to be in the beginning of the action list, same as removes. This
lets us avoid clashes in the dirstate where a directory is forgotten and a
file with the same name is added, or vice versa.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 06 Nov 2013 10:20:18 -0800 |
parents | ac08ff370977 |
children | 339e3cc073ac |
line wrap: on
line source
{header} <title>{repo|escape}: {file|escape} diff</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/{node|short}{sessionvars%urlparameter}">log</a></li> <li><a href="{url|urlescape}graph/{node|short}{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/{node|short}{sessionvars%urlparameter}">changeset</a></li> <li><a href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> </ul> <ul> <li><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> <li class="active">diff</li> <li><a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li> <li><a href="{url|urlescape}raw-file/{node|short}/{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>diff {file|escape} @ {rev}:{node|short}</h3> <form class="search" action="{url|urlescape}log"> <p>{sessionvars%hiddenformentry}</p> <p><input name="rev" id="search1" type="text" size="30" /></p> <div id="hint">{searchhint}</div> </form> <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 linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> <div class="sourcefirst"> line diff</div> <div class="stripes2 diffblocks"> {diff} </div> </div> </div> </div> {footer}