--- a/tests/test-obsolete-checkheads.t Sat Oct 05 01:02:22 2013 +0900
+++ b/tests/test-obsolete-checkheads.t Thu Oct 03 23:16:06 2013 +0900
@@ -98,7 +98,7 @@
pushing to $TESTTMP/remote (glob)
searching for changes
abort: push creates new remote head 71e3228bffe1!
- (did you forget to merge? use push -f to force)
+ (merge or see "hg help push" for details about pushing new heads)
[255]
old head is now public (public remote version)
@@ -127,7 +127,7 @@
# pushing to $TESTTMP/remote
# searching for changes
# abort: push creates new remote head 71e3228bffe1!
-# (did you forget to merge? use push -f to force)
+# (merge or see "hg help push" for details about pushing new heads)
# [255]
old head is obsolete but replacement is not pushed
@@ -158,7 +158,7 @@
pushing to $TESTTMP/remote (glob)
searching for changes
abort: push creates new remote head d7d41ccbd4de!
- (did you forget to merge? use push -f to force)
+ (merge or see "hg help push" for details about pushing new heads)
[255]