Remove -p global switch in preparation for combining namespaces
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove -p global switch in preparation for combining namespaces
manifest hash: 88b5d17097aababa5c2c9242deba51598b207e3c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyR/ywK+sNU5EO8RAvPbAJ0XtMA5E1y71hrx9ahBxU3sys98LwCghnz/
xks9tYPTnG8aizwEmg68EGw=
=5MkD
-----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 -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status