Show filename for hg export in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show filename for hg export in verbose mode. manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W M0TB/OvU0g5uvudZVQMsJd0= =yq7Y -----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