upstream/mercurial-mirror Files · mercurial/templates/atom/filelog.tmpl

simplemerge: do not allow binary files to abort an entire merge...

simplemerge: do not allow binary files to abort an entire merge When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r14328:3c65cdcf

stable

Download file

             filelog.tmpl
        
                    8 lines
            
             | 245 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / filelog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

       <id>{urlbase}{url}atom-log/tip/{file|escape}</id>

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

       <title>{repo|escape}: {file|escape} history</title>

       {latestentry%feedupdated}

      {entries%changelogentry}

      </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}atom-log/tip/{file\|escape}</id>
				<link rel="self" href="{urlbase}{url}atom-log/tip/{file\|urlescape}"/>
				<title>{repo\|escape}: {file\|escape} history</title>
				{latestentry%feedupdated}

				{entries%changelogentry}
				</feed>