# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1154481426 -7200
# Node ID 0aa45826190134b428ce79d0effa60738c7ca747
# Parent  e6bef16b6cec49a8c475a21fad3df6024edca502
fix hg backup option recommendation for auto-merge

diff -r e6bef16b6cec -r 0aa458261901 mercurial/commands.py
--- a/mercurial/commands.py	Tue Aug 01 15:51:13 2006 -0700
+++ b/mercurial/commands.py	Wed Aug 02 03:17:06 2006 +0200
@@ -942,7 +942,8 @@
         else:
             ui.status(_('the backout changeset is a new head - '
                         'do not forget to merge\n'))
-            ui.status(_('(use "backout -m" if you want to auto-merge)\n'))
+            ui.status(_('(use "backout --merge" '
+                        'if you want to auto-merge)\n'))
 
 def bundle(ui, repo, fname, dest=None, **opts):
     """create a changegroup file