changeset 30963 | 7beb3ec34443 |
parent 30959 | bd5694ce8beb |
child 30964 | afaf3c2b129c |
--- a/mercurial/commands.py Mon Feb 13 11:32:09 2017 -0800 +++ b/mercurial/commands.py Mon Feb 13 11:58:02 2017 -0800 @@ -5363,9 +5363,6 @@ brev = rev rev = scmutil.revsingle(repo, rev, rev).rev() - if check: - cmdutil.bailifchanged(repo, merge=False) - repo.ui.setconfig('ui', 'forcemerge', tool, 'update') return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)