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

r3235:e281903c default
r4696:59b8f936 default
Show More
changelog.tmpl
5 lines | 155 B | application/x-cheetah | CheetahLexer
Brendan Cully
Move RSS theme into subdirectory
r3235 #header#
<title>#repo|escape# Changelog</title>
<description>#repo|escape# Changelog</description>
#entries%changelogentry#
</channel>
</rss>