Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 48407 4d59e0f909e0
parent 48243 76c071bba40d
child 48427 38941a28406a 
--- a/mercurial/commands.py	Fri Dec 03 12:19:36 2021 +0100
+++ b/mercurial/commands.py	Fri Dec 03 12:03:23 2021 +0100
@@ -7832,9 +7832,9 @@
         raise error.InputError(_(b"you can't specify a revision and a date"))
 
     updatecheck = None
-    if check:
+    if check or merge is not None and not merge:
         updatecheck = b'abort'
-    elif merge:
+    elif merge or check is not None and not check:
         updatecheck = b'none'
 
     with repo.wlock():
mercurial