changeset 45120 | 44d5233e66a9 |
parent 45014 | 6118ad07b98d |
child 45134 | 487df3676d2c |
--- a/mercurial/commands.py Mon Jul 06 14:49:19 2020 +0200 +++ b/mercurial/commands.py Sat Aug 31 14:33:26 2019 +0200 @@ -2184,7 +2184,8 @@ """ opts = pycompat.byteskwargs(opts) - if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'): + editopts = (b'edit', b'local', b'global') + if any(opts.get(o) for o in editopts): if opts.get(b'local') and opts.get(b'global'): raise error.Abort(_(b"can't use --local and --global together"))