On Wed, Sep 1, 2021 at 2:08 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > Here are some patches to add a --remerge-diff capability to show & log, > > One sad omission from the maintainer usecase is that we do not seem > to know "git diff --remerge-diff" yet during a conflicted merge. > > "git diff [-- <path>]" before recording the resolution for the path > with "git add <path>" shows combined patch to give a final sanity > check before committing it to the rerere database. I am wondering > if viewing it in the --remrege-diff format instead would help this > step even more. We do have `git diff AUTO_MERGE`, though. It's not quite the same as it doesn't include all the "CONFLICT" messages shown in the terminal like --remerge-diff does with log/show, but otherwise it's the same. Perhaps we could even alias `git diff --remerge-diff` to `git diff AUTO_MERGE`? See commit 5291828df838 (merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict, 2021-03-20) for more details.
