Use __inline instead of inline -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use __inline instead of inline This should let us compile bdiff.c on the other OS. manifest hash: c1233bb3c7fc060e49dbd2597c122d903797db9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuu/WywK+sNU5EO8RAtqvAKC0d8Kv8He6xNCwmFnvKcff9BT4gACeLq7n 9JDFxYtWMrgjwlShfay1nL4= =GDFt -----END PGP SIGNATURE-----

#!/bin/sh +ex

mkdir test1
cd test1

hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"

cd ..
mkdir test2
cd test2

hg init
hg merge ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"

cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"

hg merge ../test2
hg heads
hg history

hg -dv co -m

ls -l ../test[12]/a > foo
cut -b 0-10 < foo