diff mercurial/cmdutil.py @ 43842:7315464f0613

status: add template/json data about whether a file has unresolved conflicts

Differential Revision: https://phab.mercurial-scm.org/D7594

--- a/mercurial/cmdutil.py	Mon Dec 09 18:15:38 2019 -0800
+++ b/mercurial/cmdutil.py	Mon Dec 09 22:06:55 2019 -0800
@@ -788,6 +788,10 @@
     unresolvedpaths = attr.ib()
     _label = b'status.morestatus'
 
+    def formatfile(self, path, fm):
+        if self.inmergestate and path in self.unresolvedpaths:
+            fm.data(unresolved=True)
+
     def formatfooter(self, fm):
         statemsg = _(b'The repository is in an unfinished *%s* state.'
                      ) % self.unfinishedop