git - smartgit 和 kdiff3 集成

Question

smartgit 自带的合并工具非常混乱。
我无法配置 kdiff3。我没有配置共同祖先。
这些是他们给我配置的仅有的三个文件： ${mergedFile} ${rightFile} ${leftFile}
有没有办法配置 kdiff3 并使用 3 路合并？

Answer 1

Actually SmartGit provides the ${baseFile} argument for 3-way merges (at least in version 3.0.x)

In the Preferences panel, under Tools > Conflict Solver make sure External Conflict Solver is selected.

Command: kdiff3
Arguments: ${baseFile} ${leftFile} ${rightFile} -o ${mergedFile}