diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
| commit | e3ab3e8a3994c916bdab540ce5d49e1755223fcf (patch) | |
| tree | 13e8aa9a18c2c9f56cf7a0754aa2b9a583dc263d /mergetools/tkdiff | |
| parent | Merge branch 'sb/oid-object-info' (diff) | |
| parent | .gitattributes: add a diff driver for Python (diff) | |
| download | tgif-e3ab3e8a3994c916bdab540ce5d49e1755223fcf.tar.xz | |
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
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions