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
remote=red
[color "diff"]
- external = /usr/local/bin/git-meld
+ external = /bin/meld
[color "status"]
added=yellow