Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix hg backup option recommendation for auto-merge
authorChristian Ebert <blacktrash@gmx.net>
Wed, 02 Aug 2006 03:17:06 +0200
changeset 2761 0aa458261901
parent 2760 e6bef16b6cec
child 2762 2df98f616645
fix hg backup option recommendation for auto-merge
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial