Tidy up conflict and pull tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Tidy up conflict and pull tests
Fix failure to kill hg serve process and pipeline ordering with set -e
manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----
#header#
<title>#repo|escape#: changelog</title>
</head>
<body>
<div class="buttons">
<a href="?cmd=tags">tags</a>
<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
</div>
<h2>changelog for #repo|escape#</h2>
<form>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30">
navigate: <small>#changenav#</small><br/>
</form>
#entries#
<form>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30">
navigate: <small>#changenav#</small><br/>
</form>
#footer#