Adding a new version of gitconfig that works with p4merge
Added p4merge as the mergetool
Now I am really adding the p4merge as mergetool