From db1a57c02e9bfbc5835d43ed4e114ec44ddfe3c4 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 25 Oct 2013 22:00:55 -0400
Subject: [PATCH] Added .gitattribute to make merging easier

---
 .gitattributes | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..97a7235c9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,27 @@
+*.h                     text diff=cpp
+*.c                     text diff=cpp
+*.cpp                   text diff=cpp
+*.java                   text diff=java
+
+*.txt                   text
+*.xml                   text
+*.html                   text diff=html
+*.dox                   text
+*.am                   text
+*.ac                   text
+*.m4                   text
+*.pro                   text
+*.in                   text
+*.1                   text
+Makefile                text
+Doxyfile                text
+
+*.py                    text diff=python
+*.pl                    text diff=perl
+*.pm                    text diff=perl
+*.base                    text diff=perl
+
+*.vcproj            text eol=crlf
+*.vcxproj*            text eol=crlf
+*.sln               text eol=crlf
+
-- 
GitLab