mac-setup
  • Introduction
  • System Preferences
  • XCode
  • iTerm2
    • ZSH
  • Homebrew
    • Usage
    • Cask
  • Git
    • Git ignore
  • Node.js
  • DBeaver
  • P4Merge
  • Apps
    • Settings
Powered by GitBook
On this page
  • 下载
  • 配置

Was this helpful?

P4Merge

PreviousDBeaverNextApps

Last updated 6 years ago

Was this helpful?

P4Merge是Git的一个第三发Diff和Merge工具(可视化冲突解决工具),免费且支持中文,有Mac和Windows版

下载

打开这个链接: ，在FAMILY下拉框选择Macintosh ，点蓝色的 Download，选择跳过 Skip Registration ，就会开始下载了。 下载到P4V.dmg文件后，双击打开，拖动其中的p4merge到Application文件夹上就可以完成安装了。

配置

如果是想在命令行的git对比文件,需要做如下设置

git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global difftool.p4merge.cmd "/Applications/p4merge.app/Contents/Resources/launchp4merge \$LOCAL \$REMOTE"
git config --global difftool.p4merge.path "/Applications/p4merge.app/Contents/Resources/launchp4merge"

以后想要比较Git中的代码时，敲git difftool filepath 即可

如果是想在SourceTree中对比,需要如下配置 点击窗口左上角的 SourceTree > Perferences > Diff 在External Diff / Merge Tab 中把Visual Diff Tool和Merge Tool的选项都改为P4Merge就可以了

P4Merge Download