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

Steven Stallion - - Load All Authors

File last commit:

r13964:616ad3f6 default


                r14328:3c65cdcf

stable

Download file

             index.tmpl
        
                    26 lines
            
             | 655 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / index.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Mercurial repositories index</title>

      </head>

      <body>

      <div class="page_header">

          <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a>

          Repositories list

      </div>

      <table cellspacing="0">

          <tr>

              <td><a href="?sort={sort_name}">Name</a></td>

              <td><a href="?sort={sort_description}">Description</a></td>

              <td><a href="?sort={sort_contact}">Contact</a></td>

              <td><a href="?sort={sort_lastchange}">Last modified</a></td>

              <td>&nbsp;</td>

              <td>&nbsp;</td>

          </tr>

          {entries%indexentry}

      </table>

      <div class="page_footer">

      {motd}

      </div>

      </body>

      </html>

	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>Mercurial repositories index</title>
				</head>
				<body>

				<div class="page_header">
				<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a>
				Repositories list
				</div>

				<table cellspacing="0">
				<tr>
				<td><a href="?sort={sort_name}">Name</a></td>
				<td><a href="?sort={sort_description}">Description</a></td>
				<td><a href="?sort={sort_contact}">Contact</a></td>
				<td><a href="?sort={sort_lastchange}">Last modified</a></td>
				<td> </td>
				<td> </td>
				</tr>
				{entries%indexentry}
				</table>
				<div class="page_footer">
				{motd}
				</div>
				</body>
				</html>