]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66dd83a) | patch
mergetools: vimdiff: fix for diffopt
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 10 Aug 2022 15:46:15 +0000 (10:46 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2022 19:39:28 +0000 (12:39 -0700)
commit60184ab4d3c7fa56a721236e53aa957226bd399f
tree5691665ea8fa79f6afc75265c33011d7e62b261ctree | snapshot
parent66dd83ad09bce1d4234f853a004c2d22d485fd84commit | diff
mergetools: vimdiff: fix for diffopt

When diffopt has hiddenoff set and there's only one window (as is the
case in the single window mode) the diff mode is turned off.

We don't want that, so turn that option off.

Cc: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/vimdiff diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.