From b8894ee8099d469c3aa120e76bc11152f9001503 Mon Sep 17 00:00:00 2001
From: Colin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Date: Wed, 10 Jul 2013 16:58:47 -0700
Subject: [PATCH] .gitconfig: add autocrlf = false, merge use diff3

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
---
 .gitconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

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
-- 
1.6.6.rc1.39.g9a42