From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jul 2022 20:00:28 +0000 (-0700)
Subject: Merge branch 'fr/vimdiff-layout-fix' into maint
X-Git-Tag: v2.37.2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0263e6bc037058f5acd70f70ecfbe7137012fd12;p=thirdparty%2Fgit.git

Merge branch 'fr/vimdiff-layout-fix' into maint

Recent update to vimdiff layout code has been made more robust
against different end-user vim settings.
source: <20220708181024.45839-1-greenfoo@u92.eu>

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

0263e6bc037058f5acd70f70ecfbe7137012fd12