From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2025 18:43:16 +0000 (-0700)
Subject: Merge branch 'fr/vimdiff-layout-fixes'
X-Git-Tag: v2.50.0-rc0~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09977c5f501bc0438dfaa99690491c849895f476;p=thirdparty%2Fgit.git

Merge branch 'fr/vimdiff-layout-fixes'

Layout configuration in vimdiff backend didn't work as advertised,
which has been corrected.

* fr/vimdiff-layout-fixes:
  mergetools: vimdiff: add tests for layout with REMOTE as the target
  mergetools: vimdiff: fix layout where REMOTE is the target
---

09977c5f501bc0438dfaa99690491c849895f476