upstream/mercurial-mirror Files · mercurial/templates/gitweb/header.tmpl

merge: make 'nothing to merge' aborts consistent...

merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

Benoit Allard - - Load All Authors

File last commit:

r14046:b24e5a70 default


                r15619:6c8573dd

default

Download file

             header.tmpl
        
                    8 lines
            
             | 497 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / header.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <?xml version="1.0" encoding="{encoding}"?>

      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">

      <head>

      <link rel="icon" href="{staticurl}hgicon.png" type="image/png" />

      <meta name="robots" content="index, nofollow"/>

      <link rel="stylesheet" href="{staticurl}style-gitweb.css" type="text/css" />

      <script type="text/javascript" src="{staticurl}mercurial.js"></script>

	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

				<?xml version="1.0" encoding="{encoding}"?>
				<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
				<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
				<head>
				<link rel="icon" href="{staticurl}hgicon.png" type="image/png" />
				<meta name="robots" content="index, nofollow"/>
				<link rel="stylesheet" href="{staticurl}style-gitweb.css" type="text/css" />
				<script type="text/javascript" src="{staticurl}mercurial.js"></script>