Johannes Schindelin [off-list ref] writes:
The sequencer already has an idea about using different merge
strategies. We just piggy-back on top of that, using rebase -i's
own settings, when running the sequencer in interactive rebase mode.
Signed-off-by: Johannes Schindelin <redacted>
---
sequencer.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
A handful of steps before and including this one look quite faithful
port to C from the scripted one.
Looking good.