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

r3264:fc34c031 default
r4696:59b8f936 default
Show More
filelog.tmpl
22 lines | 620 B | application/x-cheetah | CheetahLexer
#header#
<title>#repo|escape#: #file|escape# history</title>
<link rel="alternate" type="application/rss+xml"
href="?fl=0;file=#file|urlescape#;style=rss" title="RSS feed for #repo|escape#:#file#">
</head>
</head>
<body>
<div class="buttons">
<a href="?cl=tip">changelog</a>
<a href="?sl=tip">shortlog</a>
<a href="?tags=">tags</a>
<a href="?f=#node|short#;file=#file|urlescape#">file</a>
<a href="?fa=#node|short#;file=#file|urlescape#">annotate</a>
<a type="application/rss+xml" href="?fl=0;file=#file|urlescape#;style=rss">rss</a>
</div>
<h2>#file|escape# revision history</h2>
#entries%filelogentry#
#footer#