The merge tool that come with smartgit is very confusing.
I am not able to configure kdiff3. I dont get to configure the common ancestor.
These are the only three files they give me to configure: ${mergedFile} ${rightFile} ${leftFile}
Is there a way to configure kdiff3 and use 3-way merge?
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}