Integration with smartgit and ksdiff

Question

I would like to use Kaleidoscope / ksdiff as my conflict resolver in smartgit. I tried to configure it myself, but I can’t. So, what is the line that I need to enter into the arguments entered into the conflict conflict resolution configuration?

Screenshot:

Answer 1

The required configuration for integrating Kaleidoscope / ksdiff with smartgit is as follows:

--merge --output ${mergedFile} --base ${baseFile} -- ${leftFile} --snapshot ${rightFile} --snapshot

just put it in the argument box and the magic will happen :)