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
changeset 40578 db61a18148a4
parent 40434 3c0d5016b2be
parent 40472 da2e874fe582
child 40581 ef694e477783 
--- a/mercurial/commands.py	Fri Nov 09 10:47:24 2018 -0800
+++ b/mercurial/commands.py	Sat Nov 10 12:07:26 2018 +0900
@@ -4959,7 +4959,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