dotfiles
shell, editor, ssh.
git clone https://owenrusk.dev/dotfiles.git
commit 9e6d40205ef6af60e731233fa14da0facc16400f parent 004472059a2716a3f4f42414c3e118b9b956fca7 author Owen Rusk <owen@papermothgames.com> date 2024-07-15 19:05:48 -0500
git: histogram diffs, zdiff3 conflicts
| git/config | +5 | -0 |
diff --git a/git/config b/git/config
index c5a9960..8b24df0 100644
--- a/git/config
+++ b/git/config
@@ -12,6 +12,11 @@
autoSetupRemote = true
[fetch]
prune = true
+[diff]
+ algorithm = histogram
+ colorMoved = default
+[merge]
+ conflictStyle = zdiff3
[alias]
st = status -sb
co = checkout