comparison mercurial/commands.py @ 41687:fee1a4935c27

resolve: slightly simplify join expression by joining with empty strings Differential Revision: https://phab.mercurial-scm.org/D5938
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 10 Feb 2019 22:21:45 -0800
parents 935e06e95b91
children 8ab42ccb68fe
comparison
equal deleted inserted replaced
41686:935e06e95b91 41687:fee1a4935c27
4983 if inst.errno != errno.ENOENT: 4983 if inst.errno != errno.ENOENT:
4984 raise 4984 raise
4985 4985
4986 if hasconflictmarkers: 4986 if hasconflictmarkers:
4987 ui.warn(_('warning: the following files still have conflict ' 4987 ui.warn(_('warning: the following files still have conflict '
4988 'markers:\n ') + 4988 'markers:\n') + ''.join(' ' + uipathfn(f) + '\n'
4989 '\n '.join(uipathfn(f) for f in hasconflictmarkers) + 4989 for f in hasconflictmarkers))
4990 '\n')
4991 if markcheck == 'abort' and not all and not pats: 4990 if markcheck == 'abort' and not all and not pats:
4992 raise error.Abort(_('conflict markers detected'), 4991 raise error.Abort(_('conflict markers detected'),
4993 hint=_('use --all to mark anyway')) 4992 hint=_('use --all to mark anyway'))
4994 4993
4995 for f in tocomplete: 4994 for f in tocomplete: