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

r2173:d1943df6 default
r4696:59b8f936 default
Show More
index.tmpl
19 lines | 445 B | application/x-cheetah | CheetahLexer
mpm@selenic.com
Add a multi-repository server...
r941 #header#
<title>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
<table>
<tr>
Thomas Arendsen Hein
Make hgwebdir columns sortable.
r2173 <td><a href="?sort=#sort_name#">Name</a></td>
<td><a href="?sort=#sort_description#">Description</a></td>
<td><a href="?sort=#sort_contact#">Contact</a></td>
<td><a href="?sort=#sort_lastchange#">Last change</a></td>
Ollivier Robert
Add RSS link to the repository index....
r1125 <td>&nbsp;</td>
mpm@selenic.com
Add a multi-repository server...
r941 <tr>
mpm@selenic.com
hgweb: convert index entries to list expansion style
r982 #entries%indexentry#
mpm@selenic.com
Add a multi-repository server...
r941 </table>
#footer#