diff --git a/git/gitconfig b/git/gitconfig index 5bc0474..43fd22f 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -19,12 +19,5 @@ follow = true [pull] rebase = true -[diff] - tool = vimdiff -[merge] - tool = vimdiff - conflictstyle = diff3 -[mergetool "vimdiff"] - cmd = nvim -d $BASE $LOCAL $REMOTE [init] defaultBranch = main