Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 40625:db61a18148a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sat, 10 Nov 2018 12:07:26 +0900
parents 3c0d5016b2be da2e874fe582
children ef694e477783
comparison
equal deleted inserted replaced
40624:157f0e29eaa3 40625:db61a18148a4
4957 raise 4957 raise
4958 4958
4959 if hasconflictmarkers: 4959 if hasconflictmarkers:
4960 ui.warn(_('warning: the following files still have conflict ' 4960 ui.warn(_('warning: the following files still have conflict '
4961 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') 4961 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4962 if markcheck == 'abort' and not all: 4962 if markcheck == 'abort' and not all and not pats:
4963 raise error.Abort(_('conflict markers detected'), 4963 raise error.Abort(_('conflict markers detected'),
4964 hint=_('use --all to mark anyway')) 4964 hint=_('use --all to mark anyway'))
4965 4965
4966 for f in tocomplete: 4966 for f in tocomplete:
4967 try: 4967 try: