diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:52 -0700 |
| commit | 135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4 (patch) | |
| tree | 5a70d7731d848657bf9f8e0cc133effd0f14b297 /merge-ll.h | |
| parent | 412aff7b3379b182e3331ec66c0657ae4e39d576 (diff) | |
| download | git-135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4.tar.gz | |
merge options: add a conflict style member
Add a conflict_style member to `struct merge_options` and `struct
ll_merge_options` to allow callers to override the default conflict
style. This will be used in the next commit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ll.h')
| -rw-r--r-- | merge-ll.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-ll.h b/merge-ll.h index af1ee36abd..d038ee0c1e 100644 --- a/merge-ll.h +++ b/merge-ll.h @@ -78,11 +78,14 @@ struct ll_merge_options { */ unsigned extra_marker_size; + /* Override the global conflict style. */ + int conflict_style; + /* Extra xpparam_t flags as defined in xdiff/xdiff.h. */ long xdl_opts; }; -#define LL_MERGE_OPTIONS_INIT {0} +#define LL_MERGE_OPTIONS_INIT { .conflict_style = -1 } enum ll_merge_result { LL_MERGE_ERROR = -1, |