diff -r 16596f5e1afa -r aac816f584ad mercurial/commands.py --- a/mercurial/commands.py Wed May 06 11:40:17 2020 -0700 +++ b/mercurial/commands.py Fri May 08 08:50:47 2020 -0700 @@ -2475,16 +2475,14 @@ Returns 0 on success. """ + cmdutil.check_at_most_one_arg(opts, 'rev', 'change') opts = pycompat.byteskwargs(opts) revs = opts.get(b'rev') change = opts.get(b'change') stat = opts.get(b'stat') reverse = opts.get(b'reverse') - if revs and change: - msg = _(b'cannot specify --rev and --change at the same time') - raise error.Abort(msg) - elif change: + if change: repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') ctx2 = scmutil.revsingle(repo, change, None) ctx1 = ctx2.p1()