Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
branchstable
changeset 40472 da2e874fe582
parent 40394 1feb4b2c8e40
child 40578 db61a18148a4
child 40656 3bc2e550f2bd 
--- a/mercurial/commands.py	Fri Nov 02 14:18:29 2018 -0400
+++ b/mercurial/commands.py	Fri Nov 02 11:57:45 2018 -0700
@@ -4912,7 +4912,7 @@
         if hasconflictmarkers:
             ui.warn(_('warning: the following files still have conflict '
                       'markers:\n  ') + '\n  '.join(hasconflictmarkers) + '\n')
-            if markcheck == 'abort' and not all:
+            if markcheck == 'abort' and not all and not pats:
                 raise error.Abort(_('conflict markers detected'),
                                   hint=_('use --all to mark anyway'))
Mercurial