Added p4merge to gitconfig