summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2009-01-26 09:48:13 -0500
committerEliot Horowitz <eliot@10gen.com>2009-01-26 09:48:13 -0500
commit0bc6ab4a0d23adfbb1de32c92f8ca71d1bec9e5f (patch)
tree3042dc16345edd8550360ace57e784fb06b63721 /.gitattributes
parent8276eb75b71e8aeb4a2eeada25757661c2ad7708 (diff)
downloadmongo-0bc6ab4a0d23adfbb1de32c92f8ca71d1bec9e5f.tar.gz
treat vcproj as binary
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..c78f349b93b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.vcproj -crlf -diff -merge
+