[PATCH] Handle 'name firstname <email@server>' correctly in annotate
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
- From ed.gomez@free.fr
manifest hash: 8af8d6b2afd8caf8e48e5150b91410dea730d41a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxCpzywK+sNU5EO8RAj8tAJ9lIXS7tlgonp6B810QahCZM0NsigCdH8xQ
cRhEGvrKDrTgc4AY9guylDU=
=+sWJ
-----END PGP SIGNATURE-----
#!/bin/bash
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status