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 /sha1 | |
| 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 'sha1')
0 files changed, 0 insertions, 0 deletions