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

filemerge: default regular prompts to 'leave unresolved' (BC)...

filemerge: default regular prompts to 'leave unresolved' (BC) It makes far more sense to leave these conflicts unresolved and kick back to the user than to just assume that the local version be chosen. There are almost certainly buggy scripts and applications using Mercurial in the wild that do merges or rebases non-interactively, and then assume that if the operation succeeded there's nothing the user needs to pay attention to.

av6 - - Load All Authors

File last commit:

r25686:def530e7 default


                r27164:88d5db4b

default

Download file

             help.tmpl
        
                    34 lines
            
             | 1.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / help.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      {header}

        av6
    
hgweb: fix help pages title in gitweb and monoblue...

              r25686
            
      <title>Help: {topic}</title>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <link rel="alternate" type="application/atom+xml"

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
         href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}"/>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <link rel="alternate" type="application/rss+xml"

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
         href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}"/>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </head>

      <body>

      <div class="page_header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / help

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </div>

      <div class="page_nav">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        av6
    
hgweb: don't point file links at tip hash where it doesn't make sense...

              r25526
            
      <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |

        Yuya Nishihara
    
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help

              r13861
            
      help

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <br/>

      </div>

      <div class="title">&nbsp;</div>

        Dan Villiom Podlaski Christiansen
    
hgweb: generate HTML documentation...

              r18747
            
      <div id="doc">

      {rstdoc(doc, "html")}

      </div>

        Augie Fackler
    
web: add a help view for getting hg help output

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

Augie Fackler web: add a help view for getting hg help output	r12666	{header}
av6 hgweb: fix help pages title in gitweb and monoblue...	r25686	<title>Help: {topic}</title>
Augie Fackler web: add a help view for getting hg help output	r12666	<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-tags" title="Atom feed for {repo\|escape}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-tags" title="RSS feed for {repo\|escape}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	</head>
		<body>

		<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
		<a href="/">Mercurial</a> {pathdef%breadcrumb} / help
Augie Fackler web: add a help view for getting hg help output	r12666	</div>

		<div class="page_nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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> \|
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a> \|
Yuya Nishihara hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help	r13861	help
Augie Fackler web: add a help view for getting hg help output	r12666	<br/>
		</div>

		<div class="title"> </div>

Dan Villiom Podlaski Christiansen hgweb: generate HTML documentation...	r18747	<div id="doc">
		{rstdoc(doc, "html")}
		</div>
Augie Fackler web: add a help view for getting hg help output	r12666
		{footer}