changeset 2038 | 5c4496ed152d |
parent 2019 | ced2d3620f95 |
child 2065 | 2ff37e3bf780 |
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -101,7 +101,7 @@ this update spans a branch affecting the a (resolve) b (resolve) 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) failed abort: outstanding uncommitted changes failed