Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 40625:db61a18148a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sat, 10 Nov 2018 12:07:26 +0900
parents 3c0d5016b2be da2e874fe582
children ef694e477783
line wrap: on
line diff
--- 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'))