X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=719fcefec83ca387838cf3c438c44033f9148446;hb=b19aff368e8114dd44bbd7e306b0946f060e3051;hp=6fdaf4b1023b32784e2e28d60c36c05116ba755e;hpb=559f9045ae05e457c7eb4b6c684aa9651b98971a;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 6fdaf4b..719fcef 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -17,6 +17,15 @@
   diff=auto
   branch=auto
 
+[diff]
+  tool = meld
+
+[difftool]
+  prompt = false
+
+[difftool "meld"]
+  cmd = meld "$LOCAL" "$REMOTE"
+
 # Currently these are restating the default
 [color "branch"]
   current=green
@@ -24,7 +33,7 @@
   remote=red
 
 [color "diff"]
-  external = /usr/local/bin/git-meld
+  external = /bin/meld
 
 [color "status"]
   added=yellow