--- a/mercurial/commands.py	Mon Oct 01 09:06:01 2018 -0400
+++ b/mercurial/commands.py	Sun Sep 30 15:15:27 2018 +0900
@@ -4622,7 +4622,7 @@
             label, key = mergestateinfo[ms[f]]
             fm.startitem()
             fm.context(ctx=wctx)
-            fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
+            fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
             fm.write('path', '%s\n', f, label=label)
         fm.end()
         return 0