# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1541246153 -3600
# Node ID f28cfbaf9b5996d0820e16ab15c4fec31ce77ea1
# Parent  9249ca818ddfe9eebebbf63f47cf0b24854ce36a
Debug output of the global merge state also ("mdstate()")

diff -r 9249ca818ddf -r f28cfbaf9b59 extensions/timestamps.py
--- a/extensions/timestamps.py	Wed Oct 31 09:40:53 2018 +0100
+++ b/extensions/timestamps.py	Sat Nov 03 12:55:53 2018 +0100
@@ -995,6 +995,8 @@
                               + repr(ms.files()) + '\n')
                 self.ui.debug("UPDATE MergeState _state: "
                               + repr(ms._state) + '\n')
+                self.ui.debug("UPDATE MergeState mdstate: "
+                              + repr(ms.mdstate()) + '\n')
             if ms.active():
                 to_update.difference_update(set(ms.files()))
             if _DEV: