Make most file opening binary -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make most file opening binary This should make Windows happier manifest hash: 4a906f7c55d8af4e962385c645852d0b3d858b42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp52mywK+sNU5EO8RAtOzAJwK8MOtl3B0MDAXyJDnDFt9mHNINwCfVdRG 8z35hXvIJhz3sRo0ogdUZ0s= =eM45 -----END PGP SIGNATURE-----

     1

set -ex

     2

export EDITOR=true

     3

rm -rf test branch

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit

    11

hg verify

    12

cd ..

    13

    14

cp -a test branch

    15

cd branch

    16

echo bar>>foo

    17

hg commit

    18

    19

cd ../test

    20

hg merge ../branch

    21

hg verify

    22