"Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> diff --git a/merge-ll.c b/merge-ll.c
> index 6570707297d..bf1077ae092 100644
> --- a/merge-ll.c
> +++ b/merge-ll.c
> ..
> -#define LL_MERGE_OPTIONS_INIT {0}
> +#define LL_MERGE_OPTIONS_INIT { .conflict_style = -1 }
Makes sense, and this obviously makes the previous step worth doing.
It looks quite wrong that low-level merge options definition is
hosted in a file whose name is merge low-level. Is it too late to
rename the file to fix this, by the way?
Thanks.
