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

resolve: don't abort resolve -l even when no merge is in progress...

resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r21541:6062593d

default

Download file

             error.tmpl
        
                    10 lines
            
             | 244 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>http://mercurial.selenic.com/#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>http://mercurial.selenic.com/#error</guid>
				</item>
				</channel>
				</rss>