Mercurial > hg > mercurial-crew-with-dirclash
changeset 392:ee4c80d294e5
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-----
author | mpm@selenic.com |
---|---|
date | Fri, 17 Jun 2005 08:50:55 -0800 |
parents | 5f65a108a559 |
children | e3f564643888 |
files | tests/test-conflict tests/test-conflict.out tests/test-pull |
diffstat | 3 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-conflict +++ b/tests/test-conflict @@ -13,5 +13,5 @@ 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