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-----
#!/bin/bash
set -x
hg help
hg add -h
hg help diff
hg help foo
hg commands
exit 0