Skip to content

Commit ddf7e35

Browse files
authored
Configure diff drivers for php, phpt, c and h in .gitattributes (#8343)
1 parent 28ae065 commit ddf7e35

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.gitattributes

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
/UPGRADING merge=NEWS
1414
/UPGRADING.INTERNALS merge=NEWS
1515

16-
# Enable commit diffs for binary PHP test files. Some PHP test files include
17-
# special characters, such as ASCII control characters. Git recognizes these as
18-
# binary and wouldn't generate diffs.
19-
*.phpt diff
16+
# Configure proper diff drivers to improve the context lines in the output
17+
# of git diff and to improve token splitting for --word-diff.
18+
*.phpt diff=php
19+
*.php diff=php
20+
*.[ch] diff=cpp

0 commit comments

Comments
 (0)