From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Sep 2021 21:55:25 GMT
Subject: Re: [PATCH 0/7] Add a new --remerge-diff capability to show & log
Message-ID: <xmqqtuj4nepe.fsf@gitster.g>
In-Reply-To: <CABPp-BENXw11v3KxkFL+NsF5Qo7Pff1QdyxG2YxQB+SV6Or-Hg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> 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.

Ah, forgot about that one, so we are good.

> Perhaps we could even alias `git diff --remerge-diff` to `git diff
> AUTO_MERGE`?

I do not think it is a good idea to hide AUTO_MERGE behind an
option.  It is a feature that deserves more user awareness by
itself.

Thanks.