Minor packaging fixups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Minor packaging fixups
manifest hash: f588ece18c1e43697c4188d94ecb034e591913a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuy7aywK+sNU5EO8RAoxdAJ4l8MRhmzBo15LPnk/kb11MbSYwMQCgrLuJ
o8LeT5YpTESNtXcKqA+2dxg=
=lcNo
-----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