Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 34920:6a0e1d593bdd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: be more uniform in an "hg update" error message "can only specify one of -C/--clean, -c/--check, or -m/merge" becomes "can only specify one of -C/--clean, -c/--check, or -m/--merge"
author muxator <a.mux@inwind.it>
date Mon, 23 Oct 2017 22:45:24 +0200
parents 2e45bbd3db7b
children a74befa25ade
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Oct 04 23:22:34 2017 +0200
+++ b/mercurial/commands.py	Mon Oct 23 22:45:24 2017 +0200
@@ -5489,7 +5489,7 @@
 
     if len([x for x in (clean, check, merge) if x]) > 1:
         raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
-                            "or -m/merge"))
+                            "or -m/--merge"))
 
     updatecheck = None
     if check: