diff -r 83f75f1efdcc -r 3e40abe0a170 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sat Jul 11 00:53:34 2020 +0200
+++ b/mercurial/localrepo.py	Sat Jul 11 01:14:00 2020 +0200
@@ -2995,14 +2995,9 @@
             mergeutil.checkunresolved(ms)
 
             # internal config: ui.allowemptycommit
-            allowemptycommit = (
-                cctx.branch() != cctx.p1().branch()
-                or extra.get(b'close')
-                or merge
-                or cctx.files()
-                or self.ui.configbool(b'ui', b'allowemptycommit')
-            )
-            if not allowemptycommit:
+            if cctx.isempty() and not self.ui.configbool(
+                b'ui', b'allowemptycommit'
+            ):
                 self.ui.debug(b'nothing to commit, clearing merge state\n')
                 ms.reset()
                 return None