summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2022-08-10 10:46:15 -0500
committerJunio C Hamano <gitster@pobox.com>2022-08-10 12:39:28 -0700
commit60184ab4d3c7fa56a721236e53aa957226bd399f (patch)
tree5691665ea8fa79f6afc75265c33011d7e62b261c /commit.c
parent66dd83ad09bce1d4234f853a004c2d22d485fd84 (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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions