From: Colin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Date: Wed, 10 Jul 2013 23:58:47 +0000 (-0700)
Subject: .gitconfig: add autocrlf = false, merge use diff3
X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8894ee8099d469c3aa120e76bc11152f9001503;p=cmccabe-etc

.gitconfig: add autocrlf = false, merge use diff3

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
---

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