equal
deleted
inserted
replaced
585 mergestate = mergemod.mergestate.read(repo) |
585 mergestate = mergemod.mergestate.read(repo) |
586 if not mergestate.active(): |
586 if not mergestate.active(): |
587 return |
587 return |
588 |
588 |
589 m = scmutil.match(repo[None]) |
589 m = scmutil.match(repo[None]) |
590 unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u'] |
590 unresolvedlist = [f for f in mergestate.unresolved() if m(f)] |
591 if unresolvedlist: |
591 if unresolvedlist: |
592 mergeliststr = '\n'.join( |
592 mergeliststr = '\n'.join( |
593 [' %s' % os.path.relpath( |
593 [' %s' % os.path.relpath( |
594 os.path.join(repo.root, path), |
594 os.path.join(repo.root, path), |
595 pycompat.getcwd()) for path in unresolvedlist]) |
595 pycompat.getcwd()) for path in unresolvedlist]) |