Show More
@@ -788,6 +788,10 b' class morestatus(object):' | |||
|
788 | 788 | unresolvedpaths = attr.ib() |
|
789 | 789 | _label = b'status.morestatus' |
|
790 | 790 | |
|
791 | def formatfile(self, path, fm): | |
|
792 | if self.inmergestate and path in self.unresolvedpaths: | |
|
793 | fm.data(unresolved=True) | |
|
794 | ||
|
791 | 795 | def formatfooter(self, fm): |
|
792 | 796 | statemsg = _(b'The repository is in an unfinished *%s* state.' |
|
793 | 797 | ) % self.unfinishedop |
General Comments 0
You need to be logged in to leave comments.
Login now