1 #!/bin/sh

     2 

     3 mkdir t

     4 cd t

     5 hg init

     6 echo foo > a

     7 echo foo > a2

     8 hg add a a2

     9 hg ci -m "start" -d "0 0"

    10 hg mv a b

    11 hg mv a2 b2

    12 hg ci -m "rename" -d "0 0"

    13 echo "checkout"

    14 hg co 0

    15 echo blahblah > a

    16 echo blahblah > a2

    17 hg mv a2 c2

    18 hg ci -m "modify" -d "0 0"

    19 echo "merge"

    20 hg merge -y --debug

    21 cat a

    22 cat b

    23 hg ci -m "merge" -d "0 0"