diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:22:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:22:12 +0100 |
commit | 1d38a8e35e08d9a37393a809f8de4492759f4be3 (patch) | |
tree | 54c3f3ea92d7fcec3f4ce0767e87913fa6888230 /git-debrebase | |
parent | a1a9073c083036f1c3fd024c3b96ecbccd6b424c (diff) |
git-debrebase: merge: Whitespace changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index f93adef..771410e 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, { |