changeset 2062 | 5460f0196f77 |
parent 2038 | 5c4496ed152d |
child 2175 | b2ae81a7df29 |
--- 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 'hg merge' to merge across branches or '-C' to lose changes) +(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)