--- a/mercurial/localrepo.py	Thu Mar 05 10:46:31 2020 -0800
+++ b/mercurial/localrepo.py	Thu Mar 05 08:37:08 2020 -0800
@@ -2956,6 +2956,7 @@
                 or self.ui.configbool(b'ui', b'allowemptycommit')
             )
             if not allowemptycommit:
+                self.ui.debug(b'nothing to commit, clearing merge state\n')
                 ms.reset()
                 return None