From 4483243d121ea55e6f47911851f556e63caeb508 Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Tue, 22 Sep 2015 14:10:18 -0700
Subject: [PATCH] diff and merging tools added, need to install on mac
 though...

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index c07d6d8..94eb4ae 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -169,3 +169,7 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[filter "lfs"]
+	clean = git-lfs clean %f
+	smudge = git-lfs smudge %f
+	required = true