mercurial/cmdutil.py

40100:ca4a32d0a4d6

    m = scmutil.match(repo[None])
    unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
    if unresolvedlist:
        mergeliststr = '\n'.join(
            ['    %s' % util.pathto(repo.root, encoding.getcwd(), path)
             for path in unresolvedlist])
        msg = _('''Unresolved merge conflicts:

%s

To mark files as resolved:  hg resolve --mark FILE''') % mergeliststr

40101:57500950f40e

    m = scmutil.match(repo[None])
    unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
    if unresolvedlist:
        mergeliststr = '\n'.join(
            ['    %s' % util.pathto(repo.root, encoding.getcwd(), path)
             for path in sorted(unresolvedlist)])
        msg = _('''Unresolved merge conflicts:

%s

To mark files as resolved:  hg resolve --mark FILE''') % mergeliststr