.gitconfig change mergetool to meld
Merge branch 'master' of https://github.com/colincarr/home