# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1154713060 25200
# Node ID a9fadbef21e9287c1668ef2894600781bda75bbe
# Parent  e7f70588af30f319ccdc4ecae36c8db0becbd01b
fix output of test-backout.

diff -r e7f70588af30 -r a9fadbef21e9 tests/test-backout.out
--- a/tests/test-backout.out	Thu Aug 03 15:12:15 2006 -0700
+++ b/tests/test-backout.out	Fri Aug 04 10:37:40 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