From: Junio C Hamano Date: Wed, 23 May 2018 05:38:16 +0000 (+0900) Subject: Merge branch 'ab/perl-python-attrs' X-Git-Tag: v2.18.0-rc0~56 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e3ab3e8a3994c916bdab540ce5d49e1755223fcf Merge branch 'ab/perl-python-attrs' We learned that our source files with ".pl" and ".py" extensions are Perl and Python files respectively and changes to them are better viewed as such with appropriate diff drivers. * ab/perl-python-attrs: .gitattributes: add a diff driver for Python .gitattributes: use the "perl" differ for Perl .gitattributes: add *.pl extension for Perl --- e3ab3e8a3994c916bdab540ce5d49e1755223fcf