diff --git a/.gitattributes b/.gitattributes
index 1a0db1569af09e1e6118ee56c30a4a37994e12f4..f5b26ee75f91c3f6fa42b9b9d8616652e5806085 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 
 *.txt                   text
 *.xml                   text
+*.properties-MERGED                  text
 *.html                   text diff=html
 *.dox                   text
 *.am                   text