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

r3948:be5d099e default
r4696:59b8f936 default
Show More
header.tmpl
7 lines | 183 B | application/x-cheetah | CheetahLexer
Content-type: text/xml; charset={encoding}
<?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
<link>{urlbase}{url}</link>
<language>en-us</language>