tests/test-backout.out
changeset 2769 2ace3bf43089
parent 2619 fc0ec2b64150
child 4190 e8ee8fdeddb1
--- a/tests/test-backout.out
+++ b/tests/test-backout.out
@@ -27,7 +27,7 @@ adding b
 reverting a
 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
 the backout changeset is a new head - do not forget to merge
-(use "backout -m" if you want to auto-merge)
+(use "backout --merge" if you want to auto-merge)
 b: No such file or directory
 adding a
 adding b