Fix up test-merge1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix up test-merge1
The third test was wrong and showed up after fixing the typo in
compare code
manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ
3j5pZ3MzrtPD0y4wC3vIAA4=
=VKEy
-----END PGP SIGNATURE-----
#header#
<title>#repo|escape#: manifest #manifest|short#</title>
</head>
<body>
<div class="buttons">
<a href="?cmd=changelog;rev=#rev#">changelog</a>
<a href="?cmd=tags">tags</a>
<a href="?cmd=changeset;node=#node#">changeset</a>
</div>
<h2>manifest #manifest|short#: #path#</h2>
<table cellpadding="0" cellspacing="0">
<tr class="parity1">
<td><tt>drwxr-xr-x</tt>
<td><a href="?cmd=manifest;manifest=#manifest#;path=#up#">[up]</a>
#entries#
</table>
#footer#