Smart Card Integration and kdiff3

Question

The merge tool that comes with smartgit is very confusing.
I can not configure kdiff3. I am not going to set up a common ancestor.
These are just the three files they give me: $ {mergedFile} $ {rightFile} $ {leftFile}
Is there a way to configure kdiff3 and use tripartite merge?

Answer 1

In fact, SmartGit provides the ${baseFile} argument for triangular merges (at least in version 3.0.x)

In the Settings panel, under Tools> Conflict Conflict, make sure Conflict Screen is selected.

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