From 80f3cdae73716b5a2fe93f984f2182221dc647e4 Mon Sep 17 00:00:00 2001
From: Dan Barber <dan@evvnt.com>
Date: Sat, 23 Mar 2024 19:26:39 -0500
Subject: [PATCH] Use difftastic for git

---
 gitconfig.local | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gitconfig.local b/gitconfig.local
index b4f89af..eba8a07 100644
--- a/gitconfig.local
+++ b/gitconfig.local
@@ -12,9 +12,16 @@
   clean = git-lfs clean %f
   smudge = git-lfs smudge %f
 [diff]
-  tool = Kaleidoscope
+  external = difft
+  tool = difftastic
+[difftool]
+  prompt = false
 [difftool "Kaleidoscope"]
   cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[difftool "difftastic"]
+  cmd = difft "$LOCAL" "$REMOTE"
+[pager]
+  difftool = true
 [alias]
   ksdiff = difftool -yt Kaleidoscope
 [tig]