tests/test-merge5.out
changeset 2019 ced2d3620f95
parent 925 5a034646e472
child 2038 5c4496ed152d
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
     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 update -m to merge across branches or -C to lose changes)
     5 (use 'hg merge' to merge across branches or '-C' to lose changes)