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

r3423:a2179e78 default
r4696:59b8f936 default
Show More
filelogentry.tmpl
7 lines | 290 B | application/x-cheetah | CheetahLexer
<item>
<title>#desc|strip|firstline|strip|escape#</title>
<link>{urlbase}{url}log{#node|short#}/{file|urlescape}</link>
<description><![CDATA[#desc|strip|escape|addbreaks#]]></description>
<author>#author|obfuscate#</author>
<pubDate>#date|rfc822date#</pubDate>
</item>