From e24dff96da58738c236e11b54ba25af98f8d7f4c Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene+06108928@technicalissues.us>
Date: Fri, 3 May 2019 23:26:18 -0400
Subject: [PATCH] Added Araxis integration to sample .gitconfig

---
 copy/mac/gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/copy/mac/gitconfig b/copy/mac/gitconfig
index 5aad312..da5039b 100644
--- a/copy/mac/gitconfig
+++ b/copy/mac/gitconfig
@@ -1,8 +1,12 @@
 [core]
 	excludesfile = /Users/gliverma/.gitignore_global
+[diff]
+        tool = araxis
 [difftool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/araxiscompare-w.sh -2 \"$LOCAL\" \"$REMOTE\"
 	path = 
+[merge]
+        tool = araxis
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/araxisgitmerge-w.sh \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\"
 	trustExitCode = true