merge program setting from hgrc wasn't used.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge program setting from hgrc wasn't used.
manifest hash:
49da647e02534f51324a7a955a34c64c05bd8fa0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd
Xr+Tb86zo+xFhHq7YkDvLak=
=+BY9
-----END PGP SIGNATURE-----
mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -t "a" -u a -d "0 0"
cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -t "b" -u b -d "0 0"
hg pull ../a
hg heads