Git

Windows 下配置

先确保 p4merge 的路径（默认：C:Program FilesPerforce）在环境变量中

C:Userszjffu>where p4merge
  C:Program FilesPerforcep4merge.exe
C:Userszjffu>path
  ...;C:Program FilesPerforce;...

然后

git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge "$LOCAL" "$REMOTE"'

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'

使用

git difftool
git mergetool