view tests/test-conflict.out @ 712:b4f0fad0ea64

Merge with myself.

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

Merge with myself.

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

iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh
ka6ciaH1pQLhOyKgqdbqwOA=
=pOV4
-----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 up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out