From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:57:25 +0000 (+0100)
Subject: git-debrebase: merge: Minor style and error message change
X-Git-Tag: archive/debian/6.7~82
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b022011b4411f442c8c0357742d1aeecaaca5732

git-debrebase: merge: Minor style and error message change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 464a14c4..d3ed731b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1344,8 +1344,9 @@ sub walk ($;$$$) {
 	    my ($btip, $bbw, $banchor) = eval {
 		walk $ib, 0, $report, $report_lprefix.'  ';
 	    };
-	    $nomerge->("walking interchange branch merge base ($ibleaf): ".
-		       $@) if length $@;
+	    $nomerge->("walking interchange branch merge base ($ibleaf):\n".
+		       $@)
+		if length $@;
 
 	    $mwrecknote->("mergebase-laundered", $btip);
 	    $mwrecknote->("mergebase-breakwater", $bbw);