run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.
Remove some sed's/egrep's from some tests.
#header#
<title>#repo|escape#: manifest for changeset #node|short#</title>
</head>
<body>
<div class="buttons">
<a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
<a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
<a href="#url#tags{sessionvars%urlparameter}">tags</a>
<a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a>
#archives%archiveentry#
</div>
<h2>manifest for changeset #node|short#: #path|escape#</h2>
<table cellpadding="0" cellspacing="0">
<tr class="parity1">
<td><tt>drwxr-xr-x</tt>
<td>
<td><a href="#url#file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a>
</tr>
#dentries%manifestdirentry#
#fentries%manifestfileentry#
</table>
#footer#