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

r2148:c72e618c default
r4696:59b8f936 default
Show More
footer.tmpl
8 lines | 124 B | application/x-cheetah | CheetahLexer
Colin McMillen
Add MOTD display to hgweb and hgwebdir....
r2148 #motd#
Matt Mackall
hgweb: add a mercurial link to the footer
r1417 <div class="logo">
powered by<br/>
<a href="http://www.selenic.com/mercurial/">mercurial</a>
</div>
mpm@selenic.com
Prettify the web interface...
r142 </body>
</html>