view tests/test-conflict.out @ 367:73ea73ab3359

Use errno.EPIPE rather than 32

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Use errno.EPIPE rather than 32

manifest hash: c9cb2fadf7ef4392b2f16b3f76ca2a39964b7ae0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsNNOywK+sNU5EO8RAudrAKCGKfgsHmSLdt5HYpUtX4S/QSFCQgCeKb7M
Qld4CLe1M3aktU0tugb51Gs=
=1LB7
-----END PGP SIGNATURE-----

+ 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 1c6e5a12 local 35fedfab remote a5801785
 a versions differ, resolve
working dir created .out, keeping
merging a
resolving a
file a: other d7250518 ancestor 68ba9db7
merging a failed!
+ hg id
32e80765+75234512+ tip
+ cat a
+ grep -v '>>>'
+ grep -v '<<<'
something else
=======
something
+ hg status
C a
? .out