git中的p4merge合并工具出错

Question

我已经为p4merge设置了我的类路径,设置了文件.gitconfig,但是当p4merge工具假设打开那两个冲突的文件时,我得到了这个错误.谁知道解决方案？

添加到类路径:"C:\ Program Files\Perforce\p4merge.exe"添加到.gitconfig文件:

[merge]
    tool = p4merge
[mergetool "p4merge"]
    cmd = p4merge.exe \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$MERGED\\\"

错误信息:

Normal merge conflict for 'protected/views/layouts/main.php':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (p4merge):
C:\Program Files (x86)\Git/libexec/git-core/mergetools/p4merge: line 8: p4merge:
 command not found
protected/views/layouts/main.php seems unchanged.
Was the merge successful? [y/n] n
merge of protected/views/layouts/main.php failed

Answer 1

这个对我有用：

[merge]
    keepBackup = false;
    tool = p4merge
[mergetool "p4merge"]
    path = C:/Program Files/Perforce/p4merge.exe
    cmd = \"C:/Program Files/Perforce/p4merge.exe\" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[difftool]
    prompt = false
[mergetool]
    prompt = false

Answer 2

看起来找不到 p4merge，因此请尝试通过系统属性将“C:\Program Files\Perforce\”添加到 PATH 环境变量中。