##// 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
shortlogentry.tmpl
7 lines | 258 B | application/x-cheetah | CheetahLexer
<table class="slogEntry parity#parity#">
<tr>
<td class="age">#date|age#</td>
<td class="author">#author|obfuscate#</td>
<td class="node"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></td>
</tr>
</table>