tests/test-merge5.out
changeset 819 77e121a0d870
parent 814 0902ffece4b4
child 824 0932bc2fb2be
equal deleted inserted replaced
815:5a55e3011772 819:77e121a0d870
     7 removing b
     7 removing b
     8 + hg update 1
     8 + hg update 1
     9 this update spans a branch affecting the following files:
     9 this update spans a branch affecting the following files:
    10  b
    10  b
    11 aborting update spanning branches!
    11 aborting update spanning branches!
    12 (use update -m to perform a branch merge)
    12 (use update -m to merge across branches or -C to lose changes)