OrigParents => \@orig_ps);
}
- if (@p > 2) {
- return $unknown->("octopus merge");
- }
if (@p == 2 and
$r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
+ # xxx ^ metadata tag needs adding to (5)
return $classify->("MergedBreakwaters");
}
if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {
return $unknown->("unknown kind of merge from $1");
}
+ if (@p > 2) {
+ return $unknown->("octopus merge");
+ }
if (!$ENV{GIT_DEBREBASE_EXPERIMENTAL_MERGE}) {
return $unknown->("general two-parent merge");