]> git.ipfire.org Git - thirdparty/git.git/commit - block-sha1/sha1.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9dd64cb f3d7623)
Merge branch 'fr/vimdiff-layout-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jul 2022 20:31:53 +0000 (13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jul 2022 20:31:53 +0000 (13:31 -0700)
commit2c1439231ae5b63c0519b6b49f1a12ee100e5b5f
treec87d28a35a3e974ff846c2c07c9f77a56745041ftree | snapshot
parent9dd64cb4d310986dd7b8ca7fff92f9b61e0bd21acommit | diff
parentf3d7623a13566048c4a48b9db6bb09765588a735commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.