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

merge: add a config to allow conflict-free merge of changes on adjacent lines...

merge: add a config to allow conflict-free merge of changes on adjacent lines This change adds a config to make it no longer a conflict to merge changes made on adjacent lines. The reason these changes are considered a conflict is that there's no region of text at the relevant position (sync region) that's kept unchanged by both sides of the merge. The problem can be solved by making the sync regions being a bit more powerful: we can keep a 0-length sync region if we find that a block unchanged by one side is ajacent to a block unchanged by the other side. Since these 0-length sync regions are emitted using the ~same algorithm as the normal non-empty sync regions, this change involves no arbitrary decisions and I expect it to work pretty well. 0-length sync regions do create an ambiguity in a special case where two pairs of adjacent regions "meet" at the same point. This corresponds to an insertion made at the same place by the two sides of the merge, and this still results in a conflict.

Gregory Szorc - - Load All Authors

File last commit:

r32759:265196cd default


                r52974:a021da4e

default

Download file

             help.tmpl
        
                    32 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / 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>

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

              r18526
            
          <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}"/>

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

              r12666
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

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

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

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

              r12666
            
        Gregory Szorc
    
hgweb: consolidate search form for monoblue...

              r32759
            
              {searchform}

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

              r12666
            
              <ul class="page-nav">

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

              r18526
            
                  <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>

                  <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>

                  <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>

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

              r25525
            
                  <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>

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

              r18526
            
                  <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>

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

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

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

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

        Anton Shestakov
    
hgweb: don't mix tabs and spaces in monoblue templates

              r24129
            
                  <li class="current">help</li>

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

              r12666
            
              </ul>

          </div>

        av6
    
monoblue: fix page subtitle on help pages

              r26151
            
          <h2 class="no-link no-border">help</h2>

        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>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
Augie Fackler web: add a help view for getting hg help output	r12666
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Augie Fackler web: add a help view for getting hg help output	r12666
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url\|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
av6 hgweb: don't point graph links at tip hash where it doesn't make sense...	r25525	<li><a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<li><a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a></li>
Anton Shestakov hgweb: don't mix tabs and spaces in monoblue templates	r24129	<li class="current">help</li>
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
		</div>

av6 monoblue: fix page subtitle on help pages	r26151	<h2 class="no-link no-border">help</h2>
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}