Removed extra spaces for default parameters according to PEP8. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra spaces for default parameters according to PEP8. manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN Juv2dSoGteRm0DBXz7xnF4c= =PMki -----END PGP SIGNATURE-----

#!/bin/sh

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 up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status