From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:22:12 +0000 (+0100)
Subject: git-debrebase: merge: Whitespace changes
X-Git-Tag: archive/debian/6.7~112
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1d38a8e35e08d9a37393a809f8de4492759f4be3

git-debrebase: merge: Whitespace changes

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

diff --git a/git-debrebase b/git-debrebase
index f93adefc..771410ef 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1264,6 +1264,7 @@ sub walk ($;$$$) {
 		or $nomerge->("interchange merge-base ($ib)'s".
 			      " breakwater ($bbw)".
 			      " != breakwaters' merge-base ($bwb)");
+
 	    grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps
 		 or $nomerge->("interchange merge-base ($ib)'s".
 			       " anchor ($ibinfo->{SeriesBase})".
@@ -1271,7 +1272,6 @@ sub walk ($;$$$) {
 			       (join ' ', map { $_->{Anchor} } @$ps).
 			       ")");
 
-
 	    $cl->{MergeInterchangeBaseInfo} = $ibinfo;
 	    $cl->{MergeBestAnchor} = $best_anchor;
 	    push @brw_cl, {