41 one

    41 one

    42 two-point-five

    42 two-point-five

    43 three

    43 three

    44 EOF

    44 EOF

    45 rm -f *.orig

    45 rm -f *.orig

    46 hg commit -m "Merge 1" -d "1000000 0"

    47 hg commit -m "Merge 1" -d "1000000 0"

    47 

    48 

    48 # change test-a again

    49 # change test-a again

    49 cd ../test-a

    50 cd ../test-a

    50 cat >test.txt <<"EOF"

    51 cat >test.txt <<"EOF"