Add a CONTRIBUTORS file
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a CONTRIBUTORS file
Compiled by Rafael Villar Burke <pachi@mmn-arquitectos.com>
manifest hash: 20acfff6abdd47408d8262d15b19099c33b85151
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwvDlywK+sNU5EO8RAuujAJ4wYp+deMoUO54W8qBAFXKY3IHGPACeJNpO
x1rRm1amHz3V2RAfk/Rh9ZM=
=8t0h
-----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