X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=13ba678b9191ecc629b57c947dfc69908192f254;hb=e98aae8876a667c71195825f5d042fc7241bb142;hp=b2f74bdac1e4183171c12372ea7e814d7db603c8;hpb=1a3d0aee95aee5cc91b78d17225870df9bcacb68;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index b2f74bd..13ba678 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -11,7 +11,7 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
-	excludesfile = /home/andrew/.gitignore
+  excludesfile = /home/andrew/.gitignore
 
 [color]
   status=auto
@@ -55,8 +55,12 @@
 [push]
   default = simple
 [http]
-	sslVerify = false
+  sslVerify = false
 [credential]
-	helper = store --file ~/.git-credentials
+  helper = store --file ~/.git-credentials
 [pull]
-	rebase = false
+  rebase = false
+[merge]
+  tool = meld
+[mergetoo "meld"]
+  cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"