upstream/mercurial-mirror Files · mercurial/templates/rss/error.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

Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default


                r49599:6ae3c97a

default

Download file

             error.tmpl
        
                    10 lines
            
             | 241 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

          <title>Error</title>

          <description>Error</description>

          <item>

            <title>Error</title>

            <description>{error|escape}</description>

            <guid>https://mercurial-scm.org/#error</guid>

          </item>

        </channel>

      </rss>

	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>Error</title>
				<description>Error</description>
				<item>
				<title>Error</title>
				<description>{error\|escape}</description>
				<guid>https://mercurial-scm.org/#error</guid>
				</item>
				</channel>
				</rss>