##// 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
changelog.tmpl
38 lines | 959 B | application/x-cheetah | CheetahLexer
#header#
<title>#repo|escape#: changelog</title>
<link rel="alternate" type="application/rss+xml"
href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
</head>
<body>
<div class="buttons">
<a href="?sl=#rev#">shortlog</a>
<a href="?cmd=tags">tags</a>
<a href="?mf=#node|short#;path=/">manifest</a>
#archives%archiveentry#
<a type="application/rss+xml" href="?style=rss">rss</a>
</div>
<h2>changelog for #repo|escape#</h2>
<form action="#">
<p>
<label for="search1">search:</label>
<input type="hidden" name="cmd" value="changelog">
<input name="rev" id="search1" type="text" size="30">
navigate: <small class="navigate">#changenav%naventry#</small>
</p>
</form>
#entries%changelogentry#
<form action="#">
<p>
<label for="search2">search:</label>
<input type="hidden" name="cmd" value="changelog">
<input name="rev" id="search2" type="text" size="30">
navigate: <small class="navigate">#changenav%naventry#</small>
</p>
</form>
#footer#