updated stuff

copy/gitconfig

@@ -78,12 +78,20 @@
         compact = "%C(auto)%h %s %C(green)%ar%n %C(auto)%d%n"
         detail = "%C(auto)%h %s%n  %C(yellow)by %C(blue)%an %C(magenta)<%ae> [%G?] %C(green)%ar%n %C(auto)%d%n"
 
-[merge]
-        defaultToUpstream = true
-        tool = vimdiff
+[diff]
+    tool = meld
 
-[mergetool]
-        keepBackup = false
+[difftool]
+    prompt = false
+
+[difftool "meld"]
+    cmd = meld "$REMOTE" "$LOCAL"
+
+[merge]
+    tool = meld
+
+[mergetool "meld"]
+    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
 
 [push]
         default = upstream