ignore files associated with quilt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
ignore files associated with quilt
manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2
WdEoWI4YpiNQ+s5id6Xxphw=
=6cXJ
-----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