Add difftastic as git diff

.config/git/config

@@ -5,15 +5,21 @@
 [core]
 	excludesfile = ~/.config/git/ignore
 	editor = vim
-	pager = less
 	autocrlf = input
 [help]
 	autocorrect = 20
+
 [diff]
-	tool = vimdiff
+	tool = difftastic
+	external = difft
 [difftool]
 	prompt = false
-	trustExitCode = true
+[difftool "difftastic"]
+	cmd = difft "$LOCAL" "$REMOTE"
+[pager]
+	difftool = true
+
+
 [alias]
 	b = branch -vv
 	ci = commit
@@ -28,12 +34,10 @@
 	lo = log --graph --decorate --oneline --all
 	s = status
 
+[log]
+	date = iso
 [merge]
-	tool = vim_mergetool
-	conflictstyle = diff3
-[mergetool "vim_mergetool"]
-	cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
-	trustExitCode = true
+	conflictstyle = zdiff3
 [sendemail]
 	smtpserver = mail.serguzim.me
 	smtpuser = tobias@msrg.cc