diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 02:20:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-23 01:10:06 +0200 |
| commit | de90581141a886a79cccd0d9adb76814f3e1ab2c (patch) | |
| tree | 78f5313b9c5c1bd2afb3da9c1a334e54059b6dea /merge-ort.h | |
| parent | merge-ort: store more specific conflict information (diff) | |
| download | git-de90581141a886a79cccd0d9adb76814f3e1ab2c.tar.xz git-de90581141a886a79cccd0d9adb76814f3e1ab2c.zip | |
merge-ort: optionally produce machine-readable output
With the new `detailed` parameter, a new mode can be triggered when
displaying the merge messages: The `detailed` mode prints NUL-delimited
fields of the following form:
<path-count> NUL <path>... NUL <conflict-type> NUL <message>
The `<path-count>` field determines how many `<path>` fields there are.
The intention of this mode is to support server-side operations, where
worktree-less merges can lead to conflicts and depending on the type
and/or path count, the caller might know how to handle said conflict.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.h')
| -rw-r--r-- | merge-ort.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.h b/merge-ort.h index c4909bcbf9..a994c9a5fc 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -87,6 +87,7 @@ void merge_switch_to_result(struct merge_options *opt, * so only call this when bypassing merge_switch_to_result(). */ void merge_display_update_messages(struct merge_options *opt, + int detailed, struct merge_result *result); struct stage_info { |