tests/test-merge4
changeset 11977 db2a291e25e9
parent 11976 b28fc3b3efd6
child 11978 ef4a1ffbf519
equal deleted inserted replaced
11976:b28fc3b3efd6 11977:db2a291e25e9
     1 #!/bin/sh
       
     2 
       
     3 hg init
       
     4 echo This is file a1 > a
       
     5 hg add a
       
     6 hg commit -m "commit #0" -d "1000000 0"
       
     7 echo This is file b1 > b
       
     8 hg add b
       
     9 hg commit -m "commit #1" -d "1000000 0"
       
    10 hg update 0
       
    11 echo This is file c1 > c
       
    12 hg add c
       
    13 hg commit -m "commit #2" -d "1000000 0"
       
    14 hg merge 1
       
    15 rm b
       
    16 echo This is file c22 > c
       
    17 hg commit -m "commit #3" -d "1000000 0"