From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jul 2022 20:31:53 +0000 (-0700)
Subject: Merge branch 'fr/vimdiff-layout-fix'
X-Git-Tag: v2.38.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c1439231ae5b63c0519b6b49f1a12ee100e5b5f;p=thirdparty%2Fgit.git

Merge branch 'fr/vimdiff-layout-fix'

Recent update to vimdiff layout code has been made more robust
against different end-user vim settings.

* fr/vimdiff-layout-fix:
  vimdiff: make layout engine more robust against user vim settings
---

2c1439231ae5b63c0519b6b49f1a12ee100e5b5f