summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 8aedbaa83d7..d11f2120249 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@
*.cpp text
*.h text
*.test text
+*.java text
# Declare files that will always have LF line endings on checkout.
*.result text eol=lf
@@ -29,3 +30,4 @@ storage/connect/mysql-test/connect/std_data/*.dat binary
*.cc diff=cpp
*.ic diff=cpp
*.cpp diff=cpp
+*.java diff=cpp