Generate a friendlier except for failed lookups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Generate a friendlier except for failed lookups
manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF
MmQ/ZIvxoJOjYTo+PLBWMqI=
=4VIg
-----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