0
4

1 回答 1

1

经过一段时间的调试，我想我已经完全解决了这个问题，只需在文件中添加一个代码片段mergetool.tcl。

tortoisemerge {
    #set cmdline [list "$merge_tool_path" -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"]
    #Note: no quote around the $BASE like variables, because those cause escaped quote
    #and it looks like TortoiseGitMerge does not support such formats.
    set cmdline [list "$merge_tool_path" -base:$BASE -mine:$LOCAL -theirs:$REMOTE -merged:$MERGED]
}

那么问题就可以解决了。在这里查看一些讨论：google group discussion。

于 2017-07-23T10:01:26.357 回答