diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:52 -0700 |
| commit | 412aff7b3379b182e3331ec66c0657ae4e39d576 (patch) | |
| tree | 67056885c326766b7e4dadad774933c7ddcc629a /merge-recursive.c | |
| parent | 7457014be5d095aac55cabd24c82bf0e42641f3b (diff) | |
| download | git-412aff7b3379b182e3331ec66c0657ae4e39d576.tar.gz | |
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-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index a0c3e7a2d9..02b7b584f9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1047,7 +1047,7 @@ static int merge_3way(struct merge_options *opt, const int extra_marker_size) { 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; |