P4merge作为Git合并工具

Question

我按照配置步骤将P4Merge设置为Windows中的Git合并工具。但是，与我使用Beyond Compare时不同的是，当我有合并冲突时，P4Merge会弹出一个窗口，询问要比较的两个文件。Beyond Compare自动打开选定文件的应用程序，然后一旦文件被合并，就会打开下一个文件，直到所有文件都完成。P4Merge能做到这一点吗？如果是这样的话，是怎么做的？

我使用的是最新版本的Git和P4Merge。

我的配置是：

[merge]
    tool = p4merge
[mergetool "p4merge"]
    path = C:/Program Files/Perforce/p4merge.exe
[mergetool]
    propt = false
[diff]
    tool = p4merge
[difftool "p4merge"]
    path = C:/Program Files/Perforce/p4merge.exe
[difftool]
    propt = false

Answer 1

不是真正的答案，而是对我有效的答案：

[merge]
    tool = p4merge
    guitool = p4merge
[diff]
    guitool = p4merge
[mergetool "p4merge"]
    cmd = \"C:/Program Files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
    path = C:/Program Files/Perforce/p4merge.exe
[difftool "p4merge"]
    path = C:/Program Files/Perforce/p4merge.exe
    cmd = \"C:/Program Files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"