.gitconfig: add autocrlf = false, merge use diff3
authorColin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Wed, 10 Jul 2013 23:58:47 +0000 (16:58 -0700)
committerColin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Wed, 10 Jul 2013 23:58:47 +0000 (16:58 -0700)
commitb8894ee8099d469c3aa120e76bc11152f9001503
tree4fdcee59003b6e98d9bdb0b79a3b093eb72cdefe
parent69a7b03b708b71feb1743cfeaa635d7443522e43
.gitconfig: add autocrlf = false, merge use diff3

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