Adding .gitconfig file for use in setting up p4merge as merge and diff tool