comparison mercurial/commands.py @ 41687:fee1a4935c27

resolve: slightly simplify join expression by joining with empty strings

Differential Revision: https://phab.mercurial-scm.org/D5938

41686:935e06e95b91

                        if inst.errno != errno.ENOENT:
                            raise

        if hasconflictmarkers:
            ui.warn(_('warning: the following files still have conflict '
                      'markers:\n  ') +
                    '\n  '.join(uipathfn(f) for f in hasconflictmarkers) +
                    '\n')
            if markcheck == 'abort' and not all and not pats:
                raise error.Abort(_('conflict markers detected'),
                                  hint=_('use --all to mark anyway'))

        for f in tocomplete:

41687:fee1a4935c27

                        if inst.errno != errno.ENOENT:
                            raise

        if hasconflictmarkers:
            ui.warn(_('warning: the following files still have conflict '
                      'markers:\n') + ''.join('  ' + uipathfn(f) + '\n'
                                              for f in hasconflictmarkers))
            if markcheck == 'abort' and not all and not pats:
                raise error.Abort(_('conflict markers detected'),
                                  hint=_('use --all to mark anyway'))

        for f in tocomplete: