diff --git a/git/.gitconfig b/git/.gitconfig index 3054947..ae20b24 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -15,7 +15,7 @@ [fetch] prune = true [merge] - tool = vimdiff + tool = vimdiff3 conflictstyle = diff3 [mergetool] prompt = false