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