gitconfig add merge tool
macports update