##// 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
search.tmpl
33 lines | 607 B | application/x-cheetah | CheetahLexer
#header#
<title>#repo|escape#: searching for #query|escape#</title>
</head>
<body>
<div class="buttons">
<a href="?cl=tip">changelog</a>
<a href="?sl=tip">shortlog</a>
<a href="?tags=">tags</a>
<a href="?mf=#node|short#;path=/">manifest</a>
</div>
<h2>searching for #query|escape#</h2>
<form>
<p>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30" value="#query|escape#">
</p>
</form>
#entries#
<form>
<p>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30" value="#query|escape#">
</p>
</form>
#footer#