From 174433900709a41b3d6299f0c6e7d37d75b5ef96 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 09:09:22 -0400 Subject: [PATCH] Make mergetool meld --- git/gitconfig.dotfile | 2 ++ 1 file changed, 2 insertions(+) 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