fixed osx install
git p4merge
git config for osx