diff options
| author | Elijah Newren <newren@gmail.com> | 2022-02-02 03:37:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-02 19:02:28 +0100 |
| commit | 20323d104ec389505e83b9376c8ecab94e852fb8 (patch) | |
| tree | 2a2190c34b5ab8a20a19465e4654c95ebc0a3cd0 /merge-ort.h | |
| parent | diff: add ability to insert additional headers for paths (diff) | |
| download | git-20323d104ec389505e83b9376c8ecab94e852fb8.tar.xz 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 'merge-ort.h')
| -rw-r--r-- | merge-ort.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/merge-ort.h b/merge-ort.h index c011864ffe..fe599b8786 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -5,6 +5,7 @@ struct commit; struct tree; +struct strmap; struct merge_result { /* @@ -24,6 +25,15 @@ struct merge_result { struct tree *tree; /* + * Special messages and conflict notices for various paths + * + * This is a map of pathnames to strbufs. It contains various + * warning/conflict/notice messages (possibly multiple per path) + * that callers may want to use. + */ + struct strmap *path_messages; + + /* * Additional metadata used by merge_switch_to_result() or future calls * to merge_incore_*(). Includes data needed to update the index (if * !clean) and to print "CONFLICT" messages. Not for external use. |