From 5c4509481b1d6e1458b980422d670bc39eb90a4c Mon Sep 17 00:00:00 2001
From: Shu Kutsuzawa <cappyzawa@gmail.com>
Date: Sun, 12 Nov 2023 00:15:36 +0900
Subject: [PATCH] use difft

---
 .config/aqua/aqua.yaml | 1 +
 .gitconfig             | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.config/aqua/aqua.yaml b/.config/aqua/aqua.yaml
index 96601a19..c56eb411 100644
--- a/.config/aqua/aqua.yaml
+++ b/.config/aqua/aqua.yaml
@@ -73,3 +73,4 @@ packages:
 - name: protocolbuffers/protobuf-go/protoc-gen-go@v1.31.0
 - name: neovim/neovim@stable
   registry: custom
+- name: Wilfred/difftastic@0.52.0
diff --git a/.gitconfig b/.gitconfig
index 7ab573e7..7742d540 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,7 +6,6 @@
   excludesfile = ~/.gitignore_global
   ignorecase = false
   editor = nvim
-  ; pager = delta
 [gpg]
   program = gpg2
 [alias]
@@ -24,9 +23,8 @@
 [merge]
   conflictstyle = diff3
 [diff]
-  colorMoved = default
-[difftool "nvimdiff"]
-  cmd = "nvim -R -d -c \"wincmd l\" -d \"$LOCAL\" \"$REMOTE\""
+  tool = difftastic
+  external = difft
 [pull]
   rebase = true
 [init]