chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: merge: Remove a redundant check
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index bc725fa3c802679f51a98395fcec625158cb0351..499cda2eef4946b72cfec4bbabc753c2aecb0ce7 100755
(executable)
--- 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