aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorBrian Jordan2012-03-27 19:00:05 -0400
committerBrian Jordan2012-03-27 19:00:05 -0400
commit62f14063fbf026a0a048b160ce93c91fa57bc5bc (patch)
treecfdf0b8085e327699e9e454438b6a0c21a375203 /.gitattributes
parent176ea2eef31deaa3a3646807522c5580ac4df30a (diff)
downloadVideo-Tuneup-62f14063fbf026a0a048b160ce93c91fa57bc5bc.tar.bz2
add git prefs
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a84fc01
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.pbxproj -merge -crlf -diff