Merge branch 'po/everyday-doc' into maint

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 893b9a8bb50a7830f725971191768fc424476560..d9a52a52df338926cdc21ea925cebc2dd7c3a388 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1798,12 +1798,10 @@ sub find_extra_svn_parents {
                       );
 
                if ($ninc) {
-                       warn "W:svn cherry-pick ignored ($spec) - missing " .
+                       warn "W: svn cherry-pick ignored ($spec) - missing " .
                                "$ninc commit(s) (eg $ifirst)\n";
                } else {
-                       warn
-                               "Found merge parent ($spec): ",
-                                       $merge_tip, "\n";
+                       warn "Found merge parent ($spec): ", $merge_tip, "\n";
                        push @new_parents, $merge_tip;
                }
        }