Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE-----

     1

#!/bin/bash

     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 -d up -m 1

    15

hg id

    16

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

    17

hg status