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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r21541:6062593d

default

Download file

             branches.tmpl
        
                    11 lines
            
             | 359 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / branches.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

       <link rel="self" href="{urlbase}{url|urlescape}atom-tags"/>

       <link rel="alternate" href="{urlbase}{url|urlescape}tags"/>

       <title>{repo|escape}: branches</title>

       <summary>{repo|escape} branch history</summary>

       <author><name>Mercurial SCM</name></author>

       {latestentry%feedupdated}

       {entries%branchentry}

      </feed>

	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}
				<id>{urlbase}{url\|urlescape}</id>
				<link rel="self" href="{urlbase}{url\|urlescape}atom-tags"/>
				<link rel="alternate" href="{urlbase}{url\|urlescape}tags"/>
				<title>{repo\|escape}: branches</title>
				<summary>{repo\|escape} branch history</summary>
				<author><name>Mercurial SCM</name></author>
				{latestentry%feedupdated}

				{entries%branchentry}
				</feed>