| commit | 4483ea9a01d2a03641ce3c4e3723ea0bfeac705c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jul 2022 22:04:02 +0000 (22 15:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jul 2022 22:04:02 +0000 (22 15:04 -0700) | ||
| tree | f04c502496de48c08b96bc80401f850422ec29e2 | treesnapshot (tar.gz zip) |
| parent | 18bbc795fc52dc543e279c213fd1bfe27afc6092 | commitdiff |
| parent | ccc7b5148bdd9deb33f3cfa5a872a74634105021 | commitdiff |
Merge branch 'js/vimdiff-quotepath-fix'
Variable quoting fix in the vimdiff driver of "git mergetool"
* js/vimdiff-quotepath-fix:
mergetool(vimdiff): allow paths to contain spaces again
Variable quoting fix in the vimdiff driver of "git mergetool"
* js/vimdiff-quotepath-fix:
mergetool(vimdiff): allow paths to contain spaces again
| mergetools/vimdiff | diff1 | diff2 | blobhistory |