Update TODO
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update TODO
manifest hash: 6de50aff50eb482a3358a72ff0108b446688d034
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuy6CywK+sNU5EO8RAuJsAJ9Ruxq09SmJSrGY9nlQvieYohFEAQCgjzc1
rjTPS0nh0mHuoE41orgop5A=
=q2oN
-----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
grep -Ev ">>>|<<<" a
hg status