Mercurial > hg
view mercurial/templates/gitweb/filerevision.tmpl @ 22841:18b3869179f9
merge: make error message consistent with other commands
If a merge is attempted when another merge is already ongoing, we give
the message "outstanding uncommitted merges". Many other commands
(such as backout, rebase, histedit) give the same message in singular
form. Since the singular form also seems to make more sense, let's use
that for 'hg merge' as well.
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Wed, 08 Oct 2014 14:16:53 -0700 |
parents | 52305554fd6e |
children | 30f449378f64 |
line wrap: on
line source
{header} <title>{repo|escape}: {file|escape}@{node|short}</title> <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> </head> <body> <div class="page_header"> <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> <a href="/">Mercurial</a> {pathdef%breadcrumb} / file revision </div> <div class="page_nav"> <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> | <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | <a href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> | <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | file | <a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> | <a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | <a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url|urlescape}raw-file/{node|short}/{file|urlescape}">raw</a> | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> <br/> </div> <div class="title">{file|escape}</div> <div class="title_text"> <table cellspacing="0"> <tr> <td>author</td> <td>{author|obfuscate}</td></tr> <tr> <td></td> <td class="date age">{date|rfc822date}</td></tr> {branch%filerevbranch} <tr> <td>changeset {rev}</td> <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr> {parent%filerevparent} {child%filerevchild} <tr> <td>permissions</td> <td style="font-family:monospace">{permissions|permissions}</td></tr> </table> </div> <div class="page_path"> {desc|strip|escape|websub|addbreaks|nonempty} </div> <div class="page_body"> {text%fileline} </div> {footer}