Unbreak dirstate debug commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Unbreak dirstate debug commands manifest hash: 0a4081443c954d278062dbfbc205119eab350191 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxQAJywK+sNU5EO8RAoIvAJ4wYqOWdVtzEL0BClN0+pLNghyS0ACggwmG 05MpMLTY6+VSueiHMwre+UE= =zo+4 -----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