diff --git a/README.md b/README.md
index 293213e..935adaa 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Designed for Unix Systems.
   * iterm2 for MacOS (via [brew](https://docs.brew.sh/Installation)) `brew install iterm2` (a color theme is in the root directory, feel free to import it in preferences)
   * [Terminology for Linux](https://www.enlightenment.org/about-terminology.md)
 * [Install asdf](https://asdf-vm.com/#/core-manage-asdf) version manager, configure with tools you'll need
+* Install [Difftastic](https://difftastic.wilfred.me.uk/installation.html)
 * Install [NeoVim](https://neovim.io/)
 * Install [LunarVim](https://www.lunarvim.org/)
   `lvim` to run
diff --git a/git/.gitconfig b/git/.gitconfig
index 7d20bd5..ba3746c 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -2,16 +2,16 @@
 	name = Ava Gaiety W.
 	email = ava@wroten.me
 [core]
-  editor = nvim
+  editor = lvim
   pager = delta
+[pager]
+  difftool = true
 [config]
 	name = Ava Gaiety Wroten
 	email = ava@wroten.me
 [push]
 	default = current
 	followtags = true
-[merge]
-	conflictstyle = zdiff3
 [init]
 	defaultBranch = main
 [help]
@@ -26,7 +26,12 @@
   theme = Nord
   features = decorations
 [diff]
-	algorithm = histogram
+  tool = difftastic
+  external = difft
+[difftool]
+  prompt = false
+[difftool "difftastic"]
+  cmd = difft "$LOCAL" "$REMOTE"
 [branch]
 	sort = -committerdate
 [tag]