[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl From: Jed Davis <jdev@panix.com> This fixes the Mac OS X build problem; hopefully it won't break any other OSes, especially since SUSv3 says arpa/inet is the right header. ( http://www.opengroup.org/onlinepubs/009695399/functions/ntohl.html ) manifest hash: 2f06ff0cffefdb35e794131afcd1f34f9fdfa5cf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEoFywK+sNU5EO8RAk6WAJ9v/pnr07zUXKM9EBQQGaKSZAlhxACdHrwS XTLSL6pPGAwaRfExGF2A3DQ= =Rtv9 -----END PGP SIGNATURE-----

#!/bin/sh

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 up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status