From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Mar 2022 18:24:10 GMT
Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Message-ID: <xmqqpmmj9l11.fsf@gitster.g>
In-Reply-To: <CA+JQ7M8_QiidajaWJpz3gFeUXiLMLiDA38W1mnWyxnMLJN3fpQ@mail.gmail.com>

Erik Cervin Edin <erik@cervined.in> writes:

> In the situations of more complicated conflicts (as well as the
> functionality you request) can be invoked using
>   git mergetool
>   git mergetool -- 'pathspec'
>   git mergetool --tool=vimdiff -- 'pathspec'

Yeah, I forgot all about "git mergetool".  I think that is the
official answer to the original question.