Re: [PATCH v2 3/7] checkout: move 'confict_style' to checkout_opts

On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy wrote: > The last patches seemed self explanatory after the first RFC and their commit message. This one is harder to reason about, as --conflict is documented as "The same as --merge option above, but ..." and --merge is "When switching

[PATCH v2 3/7] checkout: move 'confict_style' to checkout_opts

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 31245c1eb4..211a347a0c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -55,6 +55,7 @@ struct