git-debrebase: merge: Remove a redundant check

MergedBreakwaters commits are now handled by a completely other branch
of the if, so this check is now redundant.

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

1 files changed, 0 insertions, 3 deletions

diff --git a/git-debrebase b/git-debrebase
index bc725fa..499cda2 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1222,9 +1222,6 @@ sub walk ($;$$$) {
 		$build_start->('MergedBreakwaters', $cur);
 	    }
 
-	    $nomerge->("alleged merged-breakwater is not a breakwater")
-		unless $ty eq 'VanillaMerge';
-
 	    my $bwb = cmdoutput @bwbcmd;
 
 	    # OK, now we have a breakwater base, but we need the merge