equal
deleted
inserted
replaced
4910 raise |
4910 raise |
4911 |
4911 |
4912 if hasconflictmarkers: |
4912 if hasconflictmarkers: |
4913 ui.warn(_('warning: the following files still have conflict ' |
4913 ui.warn(_('warning: the following files still have conflict ' |
4914 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') |
4914 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') |
4915 if markcheck == 'abort' and not all: |
4915 if markcheck == 'abort' and not all and not pats: |
4916 raise error.Abort(_('conflict markers detected'), |
4916 raise error.Abort(_('conflict markers detected'), |
4917 hint=_('use --all to mark anyway')) |
4917 hint=_('use --all to mark anyway')) |
4918 |
4918 |
4919 for f in tocomplete: |
4919 for f in tocomplete: |
4920 try: |
4920 try: |