equal
deleted
inserted
replaced
568 |
568 |
569 m = scmutil.match(repo[None]) |
569 m = scmutil.match(repo[None]) |
570 unresolvedlist = [f for f in mergestate.unresolved() if m(f)] |
570 unresolvedlist = [f for f in mergestate.unresolved() if m(f)] |
571 if unresolvedlist: |
571 if unresolvedlist: |
572 mergeliststr = '\n'.join( |
572 mergeliststr = '\n'.join( |
573 [' %s' % os.path.relpath( |
573 [' %s' % util.pathto(repo.root, pycompat.getcwd(), path) |
574 os.path.join(repo.root, path), |
574 for path in unresolvedlist]) |
575 pycompat.getcwd()) for path in unresolvedlist]) |
|
576 msg = _('''Unresolved merge conflicts: |
575 msg = _('''Unresolved merge conflicts: |
577 |
576 |
578 %s |
577 %s |
579 |
578 |
580 To mark files as resolved: hg resolve --mark FILE''') % mergeliststr |
579 To mark files as resolved: hg resolve --mark FILE''') % mergeliststr |