merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
#header#
<title>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
<table>
<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>
#footer#