branch | stable |
changeset 34920 | 6a0e1d593bdd |
parent 34906 | 2e45bbd3db7b |
child 34929 | a74befa25ade |
--- 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: