tests/test-up-local-change.out
changeset 2019 ced2d3620f95
parent 1995 2da2d46862fb
child 2038 5c4496ed152d
--- 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 update -m to merge across branches or -C to lose changes)
+(use 'hg merge' to merge across branches or '-C' to lose changes)
 failed
 abort: outstanding uncommitted changes
 failed