--- a/tests/test-up-local-change.out	Wed Mar 29 12:45:33 2006 +0200
+++ b/tests/test-up-local-change.out	Wed Mar 29 10:27:16 2006 -0800
@@ -101,7 +101,7 @@
  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