Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 42580:eb7bd7d64a9d
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 09 Jul 2019 10:09:46 -0400 |
| parents | b8d54f4625cb 93fed084ce36 |
| children | bb135a784b70 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jul 09 12:58:29 2019 +0300 +++ b/mercurial/commands.py Tue Jul 09 10:09:46 2019 -0400 @@ -1872,7 +1872,7 @@ [('A', 'after', None, _('record a copy that has already occurred')), ('f', 'force', None, _('forcibly copy over an existing managed file')), ] + walkopts + dryrunopts, - _('[OPTION]... [SOURCE]... DEST'), + _('[OPTION]... SOURCE... DEST'), helpcategory=command.CATEGORY_FILE_CONTENTS) def copy(ui, repo, *pats, **opts): """mark files as copied for the next commit @@ -4699,7 +4699,7 @@ @command('rename|move|mv', [('A', 'after', None, _('record a rename that has already occurred')), - ('f', 'force', None, _('forcibly copy over an existing managed file')), + ('f', 'force', None, _('forcibly move over an existing managed file')), ] + walkopts + dryrunopts, _('[OPTION]... SOURCE... DEST'), helpcategory=command.CATEGORY_WORKING_DIRECTORY)