use difft

cappyzawa · Nov 11, 2023 · 5c45094 · 5c45094
1 parent a0eb611
commit 5c45094
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.config/aqua/aqua.yaml b/.config/aqua/aqua.yaml
@@ -73,3 +73,4 @@ packages:
 - name: protocolbuffers/protobuf-go/[email protected]
 - name: neovim/neovim@stable
   registry: custom
+- name: Wilfred/[email protected]
diff --git 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]