settings: Add mergetool and tig config to gitconfig


git-svn-id: https://subversion.assembla.com/svn/magicant/settings@334 9a5e03f8-c55e-0410-a490-9d27d325e308