upstream/mercurial-mirror Files · templates/filediff.tmpl

tests: add merge test for changeset 9fe267f77f56...

tests: add merge test for changeset When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r3363:ce8f31e0 default


                r4696:59b8f936

default

Download file

             filediff.tmpl
        
                    34 lines
            
             | 1003 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / templates / filediff.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #header#

      <title>#repo|escape#: #file|escape# diff</title>

      </head>

      <body>

      <div class="buttons">

      <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>

      <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>

      <a href="#url#tags{sessionvars%urlparameter}">tags</a>

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

      <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a>

      <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a>

      <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a>

      <a href="#url#raw-diff/#node|short#/#file|urlescape#">raw</a>

      </div>

      <h2>#file|escape#</h2>

      <table id="filediffEntry">

      <tr>

       <th class="revision">revision #rev#:</th>

       <td class="revision"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>

      </tr>

      #parent%filediffparent#

      #child%filediffchild#

      </table>

      <div id="fileDiff">

      #diff#

      </div>

      #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>#repo\|escape#: #file\|escape# diff</title>
				</head>
				<body>

				<div class="buttons">
				<a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
				<a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
				<a href="#url#tags{sessionvars%urlparameter}">tags</a>
				<a href="#url#rev/#node\|short#{sessionvars%urlparameter}">changeset</a>
				<a href="#url#file/#node\|short#/#file\|urlescape#{sessionvars%urlparameter}">file</a>
				<a href="#url#log/#node\|short#/#file\|urlescape#{sessionvars%urlparameter}">revisions</a>
				<a href="#url#annotate/#node\|short#/#file\|urlescape#{sessionvars%urlparameter}">annotate</a>
				<a href="#url#raw-diff/#node\|short#/#file\|urlescape#">raw</a>
				</div>

				<h2>#file\|escape#</h2>

				<table id="filediffEntry">
				<tr>
				<th class="revision">revision #rev#:</th>
				<td class="revision"><a href="#url#rev/#node\|short#{sessionvars%urlparameter}">#node\|short#</a></td>
				</tr>
				#parent%filediffparent#
				#child%filediffchild#
				</table>

				<div id="fileDiff">
				#diff#
				</div>

				#footer#