replay: add short-cut: when one merge parent is the same as before, fall

dscho · dscho · commit 2ac4d0ea7c84 · 2026-05-17T15:44:56.000Z
back to 3-way merge of the other parent's pre-/post-replay variants

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/TODO b/TODO
@@ -0,0 +1,4 @@
+if only one of the parents has been rebased (i.e. we're
+replaying O with parents P1' and P2) then can we just cherry-pick the merge -
+instead of merging P1' and P2, use P1 as the merge-base with O and P1' as the
+merge heads?
