diff --git a/test/.gitattributes b/test/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..715636d1b0a1f423abb95f8022663e9c18a3bb8b
--- /dev/null
+++ b/test/.gitattributes
@@ -0,0 +1,2 @@
+*.result diff merge=text text
+