X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=33bf39da50d47c672ba0a11e5714e59a660bebf8;hb=12786f3dae3bc98be0bd3aabff680a1d3377097e;hp=70ae5b59928977685f17c33965f820c764a4f661;hpb=755b1a17607467880f58182aed7689d1228e9b7a;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 70ae5b5..33bf39d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,7 @@
 [core]
 	editor = vim
         pager = less -FRX
+	autocrlf = false
 [color]
 	branch = auto
 	status = auto
@@ -26,3 +27,5 @@
 	url = http://review.sf.cloudera.com/ 
 [url "git@github.sf.cloudera.com:"]
 	pushInsteadOf = git://github.sf.cloudera.com/
+[merge]
+	conflictstyle = diff3