External Merge Tool option not available during a merge

andy-walker

Using SourceTree 3.4.24 on Windows

I have configured KDiff3 as DiffTool and MergeTool. Here is section from my .gitconfig:

---

[difftool "sourcetree"]

cmd = 'C:/Program Files/KDiff3/bin/kdiff3.exe' \"$LOCAL\" \"$REMOTE\"

[mergetool "sourcetree"]

cmd = 'C:/Program Files/KDiff3/bin/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"

trustExitCode = false

keepBackup = false

---

Doing an "External Diff" by right-clicking on a file with changes works.

However when doing a merge, the "Launch External Merge Tool" option is disabled.

I saw a post that suggested creating an environment variable HOME with a value %USERPROFILE%. But that was not successful.

Any suggestions appreciated.

Thank you

andy-walker

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!