mercurial/repoview.py

--- a/mercurial/repoview.py	Wed Oct 28 17:41:25 2020 +0100
+++ b/mercurial/repoview.py	Fri Oct 23 22:20:08 2020 -0400
@@ -69,7 +69,7 @@
     from . import mergestate
 
     ms = mergestate.mergestate.read(repo)
-    if ms.active():
+    if ms.active() and ms.unresolvedcount():
         for node in (ms.local, ms.other):
             rev = cl.index.get_rev(node)
             if rev is not None: