options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----

     1

#!/bin/sh

     2

     3

set -x

     4

hg init

     5

echo "nothing" > a

     6

hg add a

     7

hg commit -t ancestor -u test -d "0 0"

     8

echo "something" > a

     9

hg commit -t branch1 -u test -d "0 0"

    10

hg co 0

    11

echo "something else" > a

    12

hg commit -t branch2 -u test -d "0 0"

    13

export HGMERGE=merge

    14

hg up -m 1

    15

hg id

    16

grep -Ev ">>>|<<<" a

    17

hg status