diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:48:17 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:48:17 +0100 |
commit | a264b74abe1251ab73163cfb9b5a04ff3d41eaf9 (patch) | |
tree | 1bf8289dc4a643f7100a2fcca5a88b1ea2e74505 /git-debrebase | |
parent | b2f5228398b789f75ab9742252d088233f01420e (diff) |
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>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 3 |
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 |