Comments
Patch
@@ -64,7 +64,8 @@
[
{
"path": "a",
- "status": "M"
+ "status": "M",
+ "unresolved": true
},
{
"path": "a.orig",
@@ -6893,6 +6893,8 @@
(b' %s' + end) % uipathfn(copy[f]),
label=b'status.copied',
)
+ if morestatus:
+ morestatus.formatfile(f, fm)
if morestatus:
morestatus.formatfooter(fm)
@@ -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