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

Benoit Allard - - Load All Authors

File last commit:

r14046:b24e5a70 default


                r14328:3c65cdcf

stable

Download file

             changelogentry.tmpl
        
                    14 lines
            
             | 552 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <div>

      <a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>

      </div>

      <div class="title_text">

      <div class="log_link">

      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>

      </div>

      <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>

      </div>

      <div class="log_body">

      {desc|strip|escape|addbreaks|nonempty}

      <br/>

      <br/>

      </div>

	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

				<div>
				<a class="title" href="{url}rev/{node\|short}{sessionvars%urlparameter}"><span class="age">{date\|age}</span>{desc\|strip\|firstline\|escape\|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
				</div>
				<div class="title_text">
				<div class="log_link">
				<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>
				</div>
				<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>
				</div>
				<div class="log_body">
				{desc\|strip\|escape\|addbreaks\|nonempty}
				<br/>
				<br/>
				</div>