Re: [PATCH 1/2] mergetools: vimdiff: fix layout where REMOTE is the target

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 29, 2025, 20:46 UTC
Message-ID: <xmqqa593d0p6.fsf@gitster.g>
In-Reply-To: <CALnO6CC9M3nBoA-D7rLW_68VkKm9eZ_K7CZn1Z-BiPJWxgNYHQ@mail.gmail.com>

"D. Ben Knoble" <ben.knoble+github@gmail.com> writes:

Show 13 quoted lines

>> ...
>>                 FINAL_TARGET="BASE"
>> +       elif echo "$LAYOUT" | grep @REMOTE >/dev/null
>> +       then
>> +               FINAL_TARGET="REMOTE"
>>         else
>>                 FINAL_TARGET="MERGED"
>>         fi
>> --
>> 2.49.0
>>
>
> This looks pretty obviously correct to me, thanks!

Yeah, thanks, all.  Will queue.