Show More
@@ -4985,9 +4985,8 b' def resolve(ui, repo, *pats, **opts):' | |||||
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 |
|
|
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')) |
General Comments 0
You need to be logged in to leave comments.
Login now