diff --git a/.gitattributes b/.gitattributes
index 57ce4c7b99c..e564f9c8a34 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,12 +1,10 @@
-code/* text=auto
-
 # dmm map merger hook
 # needs additional setup, see tools/mapmerge/install.txt
-*.dmm merge=merge-dmm binary
+*.dmm merge=merge-dmm
 
 # dmi icon merger hook
 # needs additional setup, see tools/dmitool/merging.txt
-*.dmi merge=merge-dmi binary
+*.dmi merge=merge-dmi
 
 # force changelog merging to use union
 html/changelog.html merge=union