Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 3d2fe2ecda8b3d8338ccf602b571a3f8e3dc31f1..a217cb7bfe96ff6c8548f510c62c6e16b2d5faa9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 *.c.inc         diff=c
 *.h.inc         diff=c
+*.m             diff=objc
+*.py            diff=python