##// 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
manifest.tmpl
23 lines | 570 B | application/x-cheetah | CheetahLexer
#header#
<title>#repo|escape#: manifest for changeset #node|short#</title>
</head>
<body>
<div class="buttons">
<a href="?cl=#rev#">changelog</a>
<a href="?sl=#rev#">shortlog</a>
<a href="?tags=">tags</a>
<a href="?cs=#node|short#">changeset</a>
#archives%archiveentry#
</div>
<h2>manifest for changeset #node|short#: #path|escape#</h2>
<table cellpadding="0" cellspacing="0">
<tr class="parity1">
<td><tt>drwxr-xr-x</tt>&nbsp;
<td><a href="?mf=#node|short#;path=#up|urlescape#">[up]</a>
#dentries%manifestdirentry#
#fentries%manifestfileentry#
</table>
#footer#