complete .gitattributes file

diff --git a/.gitattributes b/.gitattributes
index 6b3097ade3261cc136b919113daacf3740f001c3..ed5a6a78e292e89f733723b4b948f0ced368d5a0 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-*.jar binary
\ No newline at end of file
+*.jar binary
+
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.java   text diff=java
+*.html   text diff=html
+*.xml    text diff=xml
+*.css    text
+*.js     text
+*.sql    text
\ No newline at end of file

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0bf17841392bb08672196b08f04d4cf4b8d58329..df51eddb40fddbc16f9e2072ffe24cb96d35a86c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
@@ -1,2 +1,2 @@
-get-present-timestamped-snapshot-1.0-SNAPSHOT.jar\r
+get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
 (proxied 1)
\ No newline at end of file