]> git.ipfire.org Git - thirdparty/git.git/commit - t/t5411/test-0013-bad-protocol.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0263e6bc037058f5acd70f70ecfbe7137012fd12
treeb4070ba8e0d93eb9fdd308c4f01b668c4a4da143tree | snapshot
parente5c5e343d00eefb436a8643c5308205ce4e69b13commit | diff
parentf3d7623a13566048c4a48b9db6bb09765588a735commit | diff
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
mergetools/vimdiff diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.