| commit | 412aff7b3379b182e3331ec66c0657ae4e39d576 | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Thu, 14 Mar 2024 17:05:04 +0000 (14 17:05 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Mar 2024 17:08:52 +0000 (14 10:08 -0700) | ||
| tree | 67056885c326766b7e4dadad774933c7ddcc629a | treesnapshot (tar.gz zip) |
| parent | 7457014be5d095aac55cabd24c82bf0e42641f3b | commitdiff |
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>
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>
| builtin/checkout.c | diffblobblamehistory | |
| merge-ll.c | diffblobblamehistory | |
| merge-ll.h | diffblobblamehistory | |
| merge-ort.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory |