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.
#header#
<title>Mercurial repositories index</title>
</head>
<body>
<div class="page_header">
<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a>Repositories list
</div>
<table cellspacing="0">
<tr>
<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>
<td> </td>
<tr>
#entries%indexentry#
</table>
<div class="page_footer">
#motd#
</div>
</body>
</html>