upstream/mercurial-mirror Files · mercurial/templates/spartan/index.tmpl

tests: make merge conflicts explicit in `hg annotate` tests...

tests: make merge conflicts explicit in `hg annotate` tests We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that shouldn't have been a conflict (just a bug in copy tracing). I've marked that "BROKEN". Differential Revision: https://phab.mercurial-scm.org/D6252

Angel Ezquerra <angel.ezquerra at gmail.com> - - Load All Authors

File last commit:

r18258:bebb05a7 default


                r42327:7116fc61

default

Download file

             index.tmpl
        
                    19 lines
            
             | 472 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / index.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Mercurial repositories index</title>

      </head>

      <body>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

      <table>

          <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>

          </tr>

          {entries%indexentry}

      </table>

      {footer}

	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>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

				<table>
				<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>
				</tr>
				{entries%indexentry}
				</table>

				{footer}