diff options
| author | Elijah Newren <newren@gmail.com> | 2022-02-02 02:37:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-02 10:02:28 -0800 |
| commit | 20323d104ec389505e83b9376c8ecab94e852fb8 (patch) | |
| tree | 2a2190c34b5ab8a20a19465e4654c95ebc0a3cd0 /diff-merges.c | |
| parent | diff: add ability to insert additional headers for paths (diff) | |
| download | git-20323d104ec389505e83b9376c8ecab94e852fb8.tar.gz git-20323d104ec389505e83b9376c8ecab94e852fb8.zip | |
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>
Diffstat (limited to 'diff-merges.c')
0 files changed, 0 insertions, 0 deletions