mercurial/commands.py

--- a/mercurial/commands.py	Thu Jul 18 09:42:44 2013 -0700
+++ b/mercurial/commands.py	Wed Jul 17 23:58:04 2013 +0200
@@ -4158,7 +4158,8 @@
     fm.end()
 
 @command('^merge',
-    [('f', 'force', None, _('force a merge with outstanding changes')),
+    [('f', 'force', None,
+      _('force a merge including outstanding changes (DEPRECATED)')),
     ('r', 'rev', '', _('revision to merge'), _('REV')),
     ('P', 'preview', None,
      _('review revisions to merge (no merge is performed)'))