tests/test-conflict.out
author mpm@selenic.com
Wed, 15 Jun 2005 21:12:28 -0800
changeset 374 f07d00fcd281
parent 346 f69a5d2d4fe1
child 377 e5d769afd3ef
permissions -rw-r--r--
update tests to reflect new short hash length -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests to reflect new short hash length manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4 adIvEe7OzGeG6wn0/aRoQXY= =h8+W -----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 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 '<<<'
something else
=======
something
+ hg status
C a
? .out