On Thu, Jul 23, 2020 at 2:43 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > If your merge used the merge (as opposed to diff3) style, and seeing > that the resulting conflict is not easy to review and you wish you > used diff3 style instead, it is way too late for any option to "git > merge" to help you. > > But having an option to "git checkout" lets you move forward from > that state, so it also makes 100% more sense than an option to "git > merge". > Perhaps the issue is just that it's not discoverable easily because it's a different command.
