Elijah Newren 20323d104e show, log: include conflict/warning messages in --remerge-diff headers ...

Conflicts such as modify/delete, rename/rename, or file/directory are
not representable via content conflict markers, and the normal output
messages notifying users about these were dropped with --remerge-diff.
While we don't want these messages randomly shown before the commit
and diff headers, we do want them to still be shown; include them as
part of the diff headers instead.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2022-02-02 10:02:28 -08:00

32 KiB

Raw Blame History

View Raw