diff --git a/.gitattributes b/.gitattributes
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,10 @@
+# Default to Unix line-endings by default with all non-third-party code.
+*		text=auto eol=lf
+cddl/contrib/**	-text
+contrib/**	-text
+crypto/**	-text
+sys/contrib/**	-text
+
 *.c    diff=cpp
 *.h    diff=cpp
 *.cpp  diff=cpp
diff --git a/usr.bin/bintrans/tests/.gitattributes b/usr.bin/bintrans/tests/.gitattributes
new file mode 100644
--- /dev/null
+++ b/usr.bin/bintrans/tests/.gitattributes
@@ -0,0 +1 @@
+textqpenc	-text
diff --git a/usr.bin/diff3/tests/.gitattributes b/usr.bin/diff3/tests/.gitattributes
new file mode 100644
--- /dev/null
+++ b/usr.bin/diff3/tests/.gitattributes
@@ -0,0 +1 @@
+1cr.txt -text