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-----

tests/test-conflict

@@ -13,5 +13,5 b' hg commit -t branch2 -u test -d "0 0"'
 export HGMERGE=merge
 hg -d up -m 1
 hg id
-cat a | grep -v ">>>" | grep -v "<<<"
+grep -Ev ">>>|<<<" a
 hg status

tests/test-conflict.out

@@ -21,9 +21,7 b' file a: other d7250518cb1b ancestor 68ba'
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip
-+ cat a
-+ grep -v '>>>'
-+ grep -v '<<<'
++ grep -Ev '>>>|<<<' a
 something else
 =======
 something

tests/test-pull

@@ -1,7 +1,5 b''
 #!/bin/bash
 
-set -e
-
 mkdir test
 cd test
 echo foo>foo
@@ -10,7 +8,6 b' hg addremove'
 hg commit -t "1"
 hg verify
 hg serve -p 20059 2>/dev/null &
-C=$!
 cd ..
 
 mkdir copy
@@ -21,4 +18,4 b' hg co'
 cat foo
 hg manifest
 
-kill $C
+kill %hg