Alban Gruin <alban.gruin@xxxxxxxxx> writes: > Since `git-merge-one-file' has been rewritten and libified, this teaches > `merge-index' to call merge_strategies_one_file() without forking using > a new callback, merge_one_file_cb(). > > Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx> > --- I do not know how much of the change in this patch survives when the previous step gets adjusted, so I'll skip this step for now. Thanks.
