changeset 2019 | ced2d3620f95 |
parent 925 | 5a034646e472 |
child 2038 | 5c4496ed152d |
--- a/tests/test-merge5.out +++ b/tests/test-merge5.out @@ -2,4 +2,4 @@ removing b this update spans a branch affecting the following files: b aborting update spanning branches! -(use update -m to merge across branches or -C to lose changes) +(use 'hg merge' to merge across branches or '-C' to lose changes)