mercurial/templatekw.py

--- a/mercurial/templatekw.py	Wed Aug 26 17:24:22 2020 +0530
+++ b/mercurial/templatekw.py	Thu Sep 10 13:12:34 2020 -0700
@@ -422,7 +422,7 @@
             from . import mergestate as mergestatemod
 
             mergestate = mergestatemod.mergestate.read(repo)
-            if mergestate.active():
+            if mergestate.unresolvedcount():
                 merge_nodes = (mergestate.local, mergestate.other)
             else:
                 merge_nodes = ()