equal
deleted
inserted
replaced
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: |