diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 18:05:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 18:08:52 +0100 |
| commit | 412aff7b3379b182e3331ec66c0657ae4e39d576 (patch) | |
| tree | 67056885c326766b7e4dadad774933c7ddcc629a /merge-ort.c | |
| parent | xdiff-interface: refactor parsing of merge.conflictstyle (diff) | |
| download | git-412aff7b3379b182e3331ec66c0657ae4e39d576.tar.xz git-412aff7b3379b182e3331ec66c0657ae4e39d576.zip | |
merge-ll: introduce LL_MERGE_OPTIONS_INIT
Introduce a macro to initialize `struct ll_merge_options` in preparation
for the next commit that will add a new member that needs to be
initialized to a non-zero value.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8617babee4..4a02c3ecd9 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1956,7 +1956,7 @@ static int merge_3way(struct merge_options *opt, mmbuffer_t *result_buf) { mmfile_t orig, src1, src2; - struct ll_merge_options ll_opts = {0}; + struct ll_merge_options ll_opts = LL_MERGE_OPTIONS_INIT; char *base, *name1, *name2; enum ll_merge_result merge_status; |