.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 (file)
--- 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