hg push: "default-push" default target path -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg push: "default-push" default target path manifest hash: 368f3a073e172272bac06bf5b2ace78f03ffd3bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPeJywK+sNU5EO8RAuNZAKChSFEUCILHmRJmj3/7EDij3RK31gCdF2qF vQ8+72bbEPmxa3HOTdNliu0= =Nyi+ -----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
cat a | grep -v ">>>" | grep -v "<<<"
hg status