Fix typo in merging new files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix typo in merging new files
manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn
sHr/TSkxdy48OUVkhTbhhhQ=
=poww
-----END PGP SIGNATURE-----
#header#
<title>#repo|escape#: #file# diff</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>
<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a>
<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a>
<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a>
<a href="?cmd=filediff;file=#file#;node=#node#;style=raw">raw</a>
</div>
<h2>#file#</h2>
<table>
<tr>
<td class="metatag">revision #rev#:</td>
<td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
<tr>
<td class="metatag">parent #p1rev#:</td>
<td><a href="?cmd=changeset;node=#p1#">#p1|short#</a></td></tr>
</table>
<pre>
#diff#
</pre>
#footer#