diff -r c1b603cdc95a -r 5c8230ca37f2 mercurial/hg.py
--- a/mercurial/hg.py	Mon Sep 21 09:57:29 2020 -0700
+++ b/mercurial/hg.py	Mon Sep 21 11:53:44 2020 -0700
@@ -1061,7 +1061,7 @@
 
 def update(repo, node, quietempty=False, updatecheck=None):
     """update the working directory to node"""
-    stats = updaterepo(repo, node, False, updatecheck=updatecheck)
+    stats = mergemod.update(repo[node], updatecheck=updatecheck)
     _showstats(repo, stats, quietempty)
     if stats.unresolvedcount:
         repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))