tests/test-merge4
changeset 416 5e9e8b8d2629
child 749 7e4843b7efd2
equal deleted inserted replaced
415:c2b9502a4e96 416:5e9e8b8d2629
       
     1 #!/bin/sh -x
       
     2 
       
     3 hg init
       
     4 echo This is file a1 > a
       
     5 hg add a
       
     6 hg commit -t "commit #0" -d "0 0" -u user
       
     7 echo This is file b1 > b
       
     8 hg add b
       
     9 hg commit -t "commit #1" -d "0 0" -u user
       
    10 hg update 0
       
    11 echo This is file c1 > c
       
    12 hg add c
       
    13 hg commit -t "commit #2" -d "0 0" -u user
       
    14 hg update -m 1
       
    15 rm b
       
    16 echo This is file c22 > c
       
    17 hg commit -t "commit #3" -d "0 0" -u user