meld

config

@@ -1,16 +1,25 @@
 [user]
-    name = Andrey Astafyev
-    email = dev@246060.ru
+	name = Andrey Astafyev
+	email = dev@246060.ru
 
 [core]
-    editor = vim
-    pager = less -R
-    whitespace=fix,trailing-space,cr-at-eol
-    autocrlf   = input
-    safecrlf   = true
+	editor = vim
+	pager = less -R
+	whitespace=fix,trailing-space,cr-at-eol
+	autocrlf   = input
+	safecrlf   = true
 
 [merge]
-    tool = meld
+	tool = meld
+
+[diff]
+	tool = meld
+
+[difftool]
+	prompt = false
+
+[difftool "meld"]
+	cmd = meld "$LOCAL" "$REMOTE"
 
 [alias]
 	# Base commands