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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r27025:ec372573

default

Download file

             error.tmpl
        
                    15 lines
            
             | 174 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Mercurial Error</title>

      </head>

      <body>

      <h2>Mercurial Error</h2>

      <p>

      An error occurred while processing your request:

      </p>

      <p>

      {error|escape}

      </p>

      {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>Mercurial Error</title>
				</head>
				<body>

				<h2>Mercurial Error</h2>

				<p>
				An error occurred while processing your request:
				</p>
				<p>
				{error\|escape}
				</p>

				{footer}