]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5c5e34 f3d7623)
Merge branch 'fr/vimdiff-layout-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:28 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:28 +0000 (13:00 -0700)
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

1  2 
mergetools/vimdiff patch | diff1 | diff2 | blob | history

diff --cc mergetools/vimdiff
Simple merge
Unnamed repository; edit this file 'description' to name the repository.