tests/test-merge3
changeset 402 2fe8d66e3075
child 749 7e4843b7efd2
equal deleted inserted replaced
401:af4848f83e68 402:2fe8d66e3075
       
     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 touch b
       
     8 hg add b
       
     9 rm b
       
    10 hg commit -A -t"comment #1" -d "0 0" -u user