configure the gitconfig and gitignore
edd p4merge as external visual merge and diff tool
as previous one