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

@@ -1,17 +1,17 b''
 #!/bin/bash
 
 set -x
 hg init
 echo "nothing" > a
 hg add a
 hg commit -t ancestor -u test -d "0 0"
 echo "something" > a
 hg commit -t branch1 -u test -d "0 0"
 hg co 0
 echo "something else" > a
 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

@@ -1,32 +1,30 b''
 + hg init
 + echo nothing
 + hg add a
 + hg commit -t ancestor -u test -d '0 0'
 + echo something
 + hg commit -t branch1 -u test -d '0 0'
 + hg co 0
 + echo 'something else'
 + hg commit -t branch2 -u test -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
 + hg -d up -m 1
 merge: warning: conflicts during merge
 resolving manifests
  ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
  a versions differ, resolve
 working dir created .out, keeping
 merging a
 resolving a
 file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip
-+ cat a
-+ grep -v '>>>'
-+ grep -v '<<<'
++ grep -Ev '>>>|<<<' a
 something else
 =======
 something
 + hg status
 C a
 ? .out

tests/test-pull

@@ -1,24 +1,21 b''
 #!/bin/bash
 
-set -e
-
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -t "1"
 hg verify
 hg serve -p 20059 2>/dev/null &
-C=$!
 cd ..
 
 mkdir copy
 cd copy
 hg init http://localhost:20059/
 hg verify
 hg co
 cat foo
 hg manifest
 
-kill $C
+kill %hg