ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for source and text files (Raja Aluri via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584501 13f79535-47bb-0310-9956-ffa450edef68

.gitattributes

@@ -0,0 +1,19 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.cs     text diff=csharp
+*.java   text diff=java
+*.html   text diff=html
+*.py     text diff=python
+*.pl     text diff=perl
+*.pm     text diff=perl
+*.css    text
+*.js     text
+*.sql    text
+
+*.sh     text eol=lf
+
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln    text merge=union eol=crlf

CHANGES.txt

@@ -847,6 +847,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1831. Document remove watches details to the guide (Rakesh R via
   michim)
 
+  ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
+  source and text files (Raja Aluri via michim)
+
 headers
 
 Release 3.4.0 -