Add a fast binary diff extension (not yet used)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a fast binary diff extension (not yet used)
manifest hash: fbfdcab2b1f4856af45176fcf2423d602dfe88c4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuL6eywK+sNU5EO8RAoT+AJ95z9gx2IrucBS30CnCQFkZT7lSbgCgnXh5
ScZcgwzJ/mEo9i5vuKNlCIs=
=Gr58
-----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