diff --git a/gitconfig b/gitconfig index 59c7771..62bc848 100644 --- a/gitconfig +++ b/gitconfig @@ -8,7 +8,7 @@ confirm = false prompt = true [merge] - tool = vimdiff3 + tool = vimdiff [push] default = matching [alias]