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

simplemerge: move printing of merge result to extension...

simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r49599:6ae3c97a

default

Download file

             header.tmpl
        
                    5 lines
            
             | 149 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / header.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      <rss version="2.0">

        <channel>

          <link>{urlbase}{url|urlescape}</link>

          <language>en-us</language>

	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}"?>
				<rss version="2.0">
				<channel>
				<link>{urlbase}{url\|urlescape}</link>
				<language>en-us</language>