tests/test-merge5.out
changeset 767 61ed30e82b27
parent 749 7e4843b7efd2
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
equal deleted inserted replaced
766:b444a7e053f1 767:61ed30e82b27
     8 + echo This is file b22
     8 + echo This is file b22
     9 + hg commit '-mcomment #1' -d '0 0'
     9 + hg commit '-mcomment #1' -d '0 0'
    10 + hg update 0
    10 + hg update 0
    11 + rm b
    11 + rm b
    12 + hg commit -A '-mcomment #2' -d '0 0'
    12 + hg commit -A '-mcomment #2' -d '0 0'
       
    13 removing b
    13 + yes k
    14 + yes k
    14 + hg update 1
    15 + hg update 1
    15 this update spans a branch affecting the following files:
    16 this update spans a branch affecting the following files:
    16  b
    17  b
    17 aborting update spanning branches!
    18 aborting update spanning branches!