$ git config --global merge.tool p4merge $ git config --global mergetool.p4merge.path 'C:Program FilesPerforcep4merge.exe'