diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:57:25 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
| commit | b022011b4411f442c8c0357742d1aeecaaca5732 (patch) | |
| tree | 299be4fe6642155231804141156c340ed20d7afa /git-debrebase | |
| parent | ed6ced18970c0ecec79ab9697e45e07a6f7c2956 (diff) | |
git-debrebase: merge: Minor style and error message change
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 464a14c..d3ed731 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); |