Using SourceTree 3.4.24 on Windows
I have configured KDiff3 as DiffTool and MergeTool. Here is section from my .gitconfig:
OK. I have figured it out.
I used "No Staging" & "Flat List (Single Column)" options in the "File Status" tab.
This is very strange, but it seems you have to uncheck all the files (they are checked by default when doing a merge). Then once you have done that you can click on the file you want to resolve and the option is no longer disabled. Weird!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.