Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict.out @ 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 | e5d769afd3ef |
children | eb46971fc57f |
comparison
equal
deleted
inserted
replaced
391:5f65a108a559 | 392:ee4c80d294e5 |
---|---|
19 resolving a | 19 resolving a |
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 | 20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
21 merging a failed! | 21 merging a failed! |
22 + hg id | 22 + hg id |
23 32e80765d7fe+75234512624c+ tip | 23 32e80765d7fe+75234512624c+ tip |
24 + cat a | 24 + grep -Ev '>>>|<<<' a |
25 + grep -v '>>>' | |
26 + grep -v '<<<' | |
27 something else | 25 something else |
28 ======= | 26 ======= |
29 something | 27 something |
30 + hg status | 28 + hg status |
31 C a | 29 C a |