diff mercurial/commands.py @ 14853:4731d61cd36b

merge with stable
author Martin Geisler <mg@aragost.com>
date Thu, 07 Jul 2011 10:34:19 +0200
parents cac04f2f475b d87814992728
children d7b424a03627
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Jul 07 10:19:37 2011 +0200
+++ b/mercurial/commands.py	Thu Jul 07 10:34:19 2011 +0200
@@ -31,7 +31,7 @@
     ('', 'cwd', '',
      _('change working directory'), _('DIR')),
     ('y', 'noninteractive', None,
-     _('do not prompt, assume \'yes\' for any required answers')),
+     _('do not prompt, automatically pick the first choice for all prompts')),
     ('q', 'quiet', None, _('suppress output')),
     ('v', 'verbose', None, _('enable additional output')),
     ('', 'config', [],