X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=910e444df28aca907c99b7ac56c63cd32f65ccf7;hb=e8ac0f9218a53a4dab9e2e1efe0ec696b6484011;hp=18bc21f0dbb965b48f4aebc4c8a07d7e67e4ba3e;hpb=52d1506110771ee16b19be4c6b82e06559c9e6f5;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 18bc21f0..910e444d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1470,6 +1470,7 @@ sub walk ($;$$$) { @parents = map { $_->{Breakwater} } @{ $cl->{Parents} }; } elsif ($method eq 'MergeMergeSeries') { print "Running merge resolution for $cl->{CommitId}...\n"; + $mwrecknote->('new-base', $build); $build = merge_series $build, $cl->{MergeWreckNotes}, $cl->{MergeInterchangeBaseInfo},