##// END OF EJS Templates
status: remove pointless filtering by alwaysmatcher in morestatus...
Martin von Zweigbergk -
r44272:072b7459 default
parent child Browse files
Show More
@@ -783,13 +783,12 b' def _conflictsmsg(repo):'
783 783 if not mergestate.active():
784 784 return
785 785
786 m = scmutil.match(repo[None])
787 unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
786 unresolvedlist = sorted(mergestate.unresolved())
788 787 if unresolvedlist:
789 788 mergeliststr = b'\n'.join(
790 789 [
791 790 b' %s' % util.pathto(repo.root, encoding.getcwd(), path)
792 for path in sorted(unresolvedlist)
791 for path in unresolvedlist
793 792 ]
794 793 )
795 794 msg = (
General Comments 0
You need to be logged in to leave comments. Login now