]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10f9eab 34133d9)
Merge branch 'fc/vimdiff-layout-vimdiff3-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2022 18:13:12 +0000 (11:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2022 18:13:12 +0000 (11:13 -0700)
"vimdiff3" regression fix.
source: <20220810154618.307275-1-felipe.contreras@gmail.com>

* fc/vimdiff-layout-vimdiff3-fix:
  mergetools: vimdiff: simplify tabfirst
  mergetools: vimdiff: fix single window layouts
  mergetools: vimdiff: rework tab logic
  mergetools: vimdiff: fix for diffopt
  mergetools: vimdiff: silence annoying messages
  mergetools: vimdiff: make vimdiff3 actually work
  mergetools: vimdiff: fix comment


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.