diff --git a/gitconfig b/gitconfig index 376305e..536704f 100644 --- a/gitconfig +++ b/gitconfig @@ -5,7 +5,7 @@ tool = vimdiff [difftool] confirm = false - prompt = false + prompt = true [merge] tool = vimdiff3 [push]