Phillip Wood 135cc712c3 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>

2024-03-14 10:08:52 -07:00

3.3 KiB

Raw Blame History

View Raw