diff -r 2a68a5ec8dd0 -r 32ce4cbaec4b mercurial/mergeutil.py
--- a/mercurial/mergeutil.py	Sun Sep 06 10:33:12 2020 +0200
+++ b/mercurial/mergeutil.py	Thu Sep 17 22:34:36 2020 -0700
@@ -17,8 +17,3 @@
         raise error.Abort(
             _(b"unresolved merge conflicts (see 'hg help resolve')")
         )
-    if ms.mdstate() != b's' or list(ms.driverresolved()):
-        raise error.Abort(
-            _(b'driver-resolved merge conflicts'),
-            hint=_(b'run "hg resolve --all" to resolve'),
-        )