On Mon, Sep 13, 2021 at 7:06 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > * en/remerge-diff (2021-08-31) 7 commits > - doc/diff-options: explain the new --remerge-diff option > - show, log: provide a --remerge-diff capability > - tmp-objdir: new API for creating and removing primary object dirs > - merge-ort: capture and print ll-merge warnings in our preferred fashion > - ll-merge: add API for capturing warnings in a strbuf instead of stderr > - merge-ort: add ability to record conflict messages in a file > - merge-ort: mark a few more conflict messages as omittable > > A new presentation for two-parent merge "--remerge-diff" can be > used to show the difference between mechanical (and possibly > conflicted) merge results and the recorded resolution. > > What's the status of this one? Same as last time[1]: tested in the wild, high level ideas probed by you and I believe I answered them to your satisfaction, but only the diff-merges part of the code got reviews. [1] https://lore.kernel.org/git/CABPp-BGR3dfJE7TZ+jkjDdWyeXYowmJhtoFaQ8_Abn=ZROhB5Q@xxxxxxxxxxxxxx/
