diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl index 5d57ea65..38727c28 100644 --- a/home/dot_config/git/config.tmpl +++ b/home/dot_config/git/config.tmpl @@ -126,7 +126,7 @@ defaultBranch = master # templatedir = ~/.config/git/template [interactive] - diffFilter = delta --color-only --features=interactive + diffFilter = delta --color-only [merge] conflictstyle = diff3 ff = only