# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1154549076 25200
# Node ID 2ace3bf43089667f62c55e6e5d87518e40c9d88d
# Parent  b1b1aa6f275c52a0965f0efbf12dca1251566848
tests: fix output for test-backout

diff -r b1b1aa6f275c -r 2ace3bf43089 tests/test-backout.out
--- a/tests/test-backout.out	Wed Aug 02 12:46:00 2006 -0700
+++ b/tests/test-backout.out	Wed Aug 02 13:04:36 2006 -0700
@@ -27,7 +27,7 @@
 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