[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
keepTemporaries
默认为false。无论何种情况,它都应该设置为mergetool.keepTemporaries
,而不是mergetool.<Tool>.keepTemporaries
。KeepBackup
也是在没有指定<Tool>的情况下设置的。 - Alex78191trustExitCode
不应该被设置为 false (默认应该是 true)。 - Alex78191