upstream/mercurial-mirror Files · mercurial/templates/paper/error.tmpl

graft: don't drop the second parent on unsuccessful merge (issue3498)...

graft: don't drop the second parent on unsuccessful merge (issue3498) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.

Angel Ezquerra - - Load All Authors

File last commit:

r14913:44382887 default


                r17045:52ea9ce5

stable

Download file

             error.tmpl
        
                    45 lines
            
             | 1.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: error</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>

      </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>

      <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

      <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>

      <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>

      </ul>

      </div>

      <div class="main">

      <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>

      <h3>error</h3>

      <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>

      <div class="description">

      <p>

      An error occurred while processing your request:

      </p>

      <p>

      {error|escape}

      </p>

      </div>

      </div>

      </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				{header}
				<title>{repo\|escape}: error</title>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
				</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>
				<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<div class="main">

				<h2><a href="{url}{sessionvars%urlparameter}">{repo\|escape}</a></h2>
				<h3>error</h3>

				<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>

				<div class="description">
				<p>
				An error occurred while processing your request:
				</p>
				<p>
				{error\|escape}
				</p>
				</div>
				</div>
				</div>

				{footer}