Fix two minor merge bugs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix two minor merge bugs
Fix variable name for printing manifest node
Trouble with empty between lists from remote repos
manifest hash:
000e9267b17c870f673210c8aae50d99e0e5b72b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO
CLpuRURCB5Ang19YZ5MLGeg=
=NF1T
-----END PGP SIGNATURE-----
<div class="parity#parity#">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="right" width="15%"><b>#age# ago: </b></td>
<td><b>#shortdesc#</b></td</tr>
<tr>
<td align="right">changeset #rev#: </td>
<td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
#parent1#
#parent2#
<tr>
<td align="right">author: </td>
<td>#author#</td></tr>
<tr>
<td align="right">date: </td>
<td>#date#</td></tr>
<tr>
<td align="right" valign="top"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>: </td>
<td>#files#</td></tr>
</table>
</div>