]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 682079f ccc7b51)
Merge branch 'js/vimdiff-quotepath-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:26 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:26 +0000 (13:00 -0700)
commit57fe0df8a6295bc633f9fc4d2fa941900d9c109e
tree638ec0a3e3e645df5ec05cc295819bb5c81fe22btree | snapshot
parent682079fb2a14bae855b1564898237cdebd0e00b2commit | diff
parentccc7b5148bdd9deb33f3cfa5a872a74634105021commit | diff
Merge branch 'js/vimdiff-quotepath-fix' into maint

Variable quoting fix in the vimdiff driver of "git mergetool"
source: <pull.1287.v2.git.1657809063728.gitgitgadget@gmail.com>

* js/vimdiff-quotepath-fix:
  mergetool(vimdiff): allow paths to contain spaces again
mergetools/vimdiff diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.