tests/test-merge5.out
changeset 2038 5c4496ed152d
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
equal deleted inserted replaced
2037:f90513a3dbcd 2038:5c4496ed152d
     1 removing b
     1 removing b
     2 this update spans a branch affecting the following files:
     2 this update spans a branch affecting the following files:
     3  b
     3  b
     4 aborting update spanning branches!
     4 aborting update spanning branches!
     5 (use 'hg merge' to merge across branches or '-C' to lose changes)
     5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)