22 

    22 

    23 hg merge --debug 1

    23 hg merge --debug 1

    24 echo a/* b/*

    24 echo a/* b/*

    25 hg st -C

    25 hg st -C

    26 hg ci -m "3 merge 2+1" -d "0 0"

    26 hg ci -m "3 merge 2+1" -d "0 0"

    27 

    28 

    28 hg co -C 1

    29 hg co -C 1

    29 hg merge --debug 2

    30 hg merge --debug 2

    30 echo a/* b/*

    31 echo a/* b/*

    31 hg st -C

    32 hg st -C

    32 hg ci -m "4 merge 1+2" -d "0 0"

    33 hg ci -m "4 merge 1+2" -d "0 0"