X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=5de9c14b74f63e42d5628ab355febb89ace3a182;hp=499cda2eef4946b72cfec4bbabc753c2aecb0ce7;hb=4d04b76e036b801529fd19a1e45bed0a31a3c8dc;hpb=a264b74abe1251ab73163cfb9b5a04ff3d41eaf9 diff --git a/git-debrebase b/git-debrebase index 499cda2e..5de9c14b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1217,6 +1217,9 @@ sub walk ($;$$$) { } if ($ok && $might_be_in_bw) { + # We could rewrite this to contaion the metadata + # declaring it to be MergedBreakwaters, but + # unnecessarily rewriting a merge seems unhelpful. $prline->(" VanillaMerge MergedBreakwaters"); $last_anchor = $best_anchor; $build_start->('MergedBreakwaters', $cur);