##// 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:

r3363:ce8f31e0 default
r4696:59b8f936 default
Show More
changelogentry.tmpl
25 lines | 695 B | application/x-cheetah | CheetahLexer
<table class="logEntry parity#parity#">
<tr>
<th class="age">#date|age# ago:</th>
<th class="firstline">#desc|strip|firstline|escape#</th>
</tr>
<tr>
<th class="revision">changeset #rev#:</th>
<td class="node"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
</tr>
#parent%changelogparent#
#child%changelogchild#
#changelogtag#
<tr>
<th class="author">author:</th>
<td class="author">#author|obfuscate#</td>
</tr>
<tr>
<th class="date">date:</th>
<td class="date">#date|date#</td>
</tr>
<tr>
<th class="files"><a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>:</th>
<td class="files">#files#</td>
</tr>
</table>