tests/test-merge3
changeset 1933 7544700fd931
parent 814 0902ffece4b4
child 11177 6a64813276ed
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
     1 #!/bin/sh
     1 #!/bin/sh
     2 
     2 
     3 hg init
     3 hg init
     4 echo This is file a1 > a
     4 echo This is file a1 > a
     5 hg add a
     5 hg add a
     6 hg commit -m "commit #0" -d "0 0"
     6 hg commit -m "commit #0" -d "1000000 0"
     7 touch b
     7 touch b
     8 hg add b
     8 hg add b
     9 rm b
     9 rm b
    10 hg commit -A -m"comment #1" -d "0 0"
    10 hg commit -A -m"comment #1" -d "1000000 0"