diff --git a/git/.config/git/config b/git/.config/git/config index 525d7be..e3a2d7c 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -17,9 +17,3 @@ [filter "git-ignore-line.sh"] clean = /home/coolneng/.dotfiles/scripts/.local/share/scripts/git-ignore-line.sh smudge = cat -[add.interactive] - useBuiltin = false # required for git 2.37.0 -[merge] - conflictstyle = diff3 -[diff] - colorMoved = default