diff -r 8d75b9effa07 -r e5d104c35e51 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Wed Aug 23 01:09:08 2017 +0000
+++ b/mercurial/cmdutil.py	Mon Aug 21 16:43:37 2017 +0530
@@ -673,7 +673,8 @@
         statemsg = _('The repository is in an unfinished *%s* state.') % state
         fm.write('statemsg', '%s\n',  _commentlines(statemsg), label=label)
         conmsg = _conflictsmsg(repo)
-        fm.write('conflictsmsg', '%s\n', conmsg, label=label)
+        if conmsg:
+            fm.write('conflictsmsg', '%s\n', conmsg, label=label)
         if helpfulmsg:
             helpmsg = helpfulmsg()
             fm.write('helpmsg', '%s\n', helpmsg, label=label)