##// END OF EJS Templates
tests: add merge test for changeset 9fe267f77f56...
tests: add merge test for changeset 9fe267f77f56 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.

File last commit:

r3264:fc34c031 default
r4696:59b8f936 default
Show More
filerevision.tmpl
41 lines | 976 B | application/x-cheetah | CheetahLexer
#header#
<title>#repo|escape#:#file|escape#</title>
</head>
<body>
<div class="buttons">
<a href="?cl=#rev#">changelog</a>
<a href="?sl=#rev#">shortlog</a>
<a href="?tags=">tags</a>
<a href="?cs=#node|short#">changeset</a>
<a href="?mf=#node|short#;path=#path|urlescape#">manifest</a>
<a href="?fl=#node|short#;file=#file|urlescape#">revisions</a>
<a href="?fa=#node|short#;file=#file|urlescape#">annotate</a>
<a href="?f=#node|short#;file=#file|urlescape#;style=raw">raw</a>
</div>
<h2>#file|escape#</h2>
<table>
<tr>
<td class="metatag">changeset #rev#:</td>
<td><a href="?cs=#node|short#">#node|short#</a></td></tr>
#rename%filerename#
#parent%filerevparent#
#child%filerevchild#
<tr>
<td class="metatag">author:</td>
<td>#author|obfuscate#</td></tr>
<tr>
<td class="metatag">date:</td>
<td>#date|date# (#date|age# ago)</td></tr>
<tr>
<td class="metatag">permissions:</td>
<td>#permissions|permissions#</td></tr>
</table>
<pre>
#text%fileline#
</pre>
#footer#