diff --git a/git/gitconfig.dotfile b/git/gitconfig.dotfile index d35bdd8..b685a34 100644 --- a/git/gitconfig.dotfile +++ b/git/gitconfig.dotfile @@ -33,3 +33,5 @@ [user] email = ianonavy@gmail.com name = Ian Adam Naval +[merge] + tool = meld