From 3b7c8487ddce26a3533e680cbaa3be5998375ff1 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Wed, 26 Jun 2013 16:22:18 +0400
Subject: [PATCH] Mark *.result files in test/ as text to enable proper merge
 and diff

---
 test/.gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 test/.gitattributes

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