]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03f9f1a b21d164)
Merge branch 'km/mergetool-vimdiff-layout-fallback'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2024 00:04:32 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2024 00:04:32 +0000 (16:04 -0800)
Variants of vimdiff learned to honor mergetool.<variant>.layout settings.

* km/mergetool-vimdiff-layout-fallback:
  mergetools: vimdiff: use correct tool's name when reading mergetool config


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