Re: [PATCH v2 06/19] checkout: move 'confict_style' and 'dwim_..' to checkout_opts

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

These local variables are referenced by struct option[]. This struct
will soon be broken down, moved away and we can't rely on local
variables anymore. Move these two to struct checkout_opts in
preparation for that.

Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---

Up to this point all patches made sense to me.  Thanks for working
on this.