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 cat a | grep -v ">>>" | grep -v "<<<"

    17 hg status