# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1549866105 28800
# Node ID fee1a4935c277ada2f65f2687cd8fc29a6002ab6
# Parent  935e06e95b914345738167a1716b00f9b26de81a
resolve: slightly simplify join expression by joining with empty strings

Differential Revision: https://phab.mercurial-scm.org/D5938

diff -r 935e06e95b91 -r fee1a4935c27 mercurial/commands.py
--- 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'))