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 41687 fee1a4935c27
parent 41686 935e06e95b91
child 41739 8ab42ccb68fe 
--- a/mercurial/commands.py	Sun Feb 10 22:18:19 2019 -0800
+++ b/mercurial/commands.py	Sun Feb 10 22:21:45 2019 -0800
@@ -4985,9 +4985,8 @@
 
         if hasconflictmarkers:
             ui.warn(_('warning: the following files still have conflict '
-                      'markers:\n  ') +
-                    '\n  '.join(uipathfn(f) for f in hasconflictmarkers) +
-                    '\n')
+                      'markers:\n') + ''.join('  ' + uipathfn(f) + '\n'
+                                              for f in hasconflictmarkers))
             if markcheck == 'abort' and not all and not pats:
                 raise error.Abort(_('conflict markers detected'),
                                   hint=_('use --all to mark anyway'))
Mercurial