Merge pull request #3960 from dscho/fix-vimdiff-with-spaces-in-paths

mergetool(vimdiff): allow paths to contain spaces again

Author: dscho

.gitattributes

@@ -4,7 +4,6 @@
 *.perl eol=lf diff=perl
 *.pl eof=lf diff=perl
 *.pm eol=lf diff=perl
-*.png binary
 *.py eol=lf diff=python
 *.bat eol=crlf
 CODE_OF_CONDUCT.md -whitespace

.github/ISSUE_TEMPLATE.md

@@ -1,19 +1,7 @@
-Thanks for taking the time to contribute to Git!
-
-Those seeking to contribute to the Git for Windows fork should see
-http://gitforwindows.org/#contribute on how to contribute Windows specific
-enhancements.
-
-If your contribution is for the core Git functions and documentation
-please be aware that the Git community does not use the github.com issues
-or pull request mechanism for their contributions.
-
-Instead, we use the Git mailing list ([email protected]) for code and
-documentation submissions, code reviews, and bug reports. The
-mailing list is plain text only (anything with HTML is sent directly
-to the spam folder).
-
-Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
+Thanks for taking the time to contribute to Git! Please be advised that the
+Git community does not use github.com for their contributions. Instead, we use
+a mailing list ([email protected]) for code submissions, code reviews, and
+bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
 to conveniently send your Pull Requests commits to our mailing list.
 
 Please read the "guidelines for contributing" linked above!