- Status:Closed(View Workflow)
- Resolution: Obsolete
- Fix Version/s:1.0.4
I selected KDiff3.
KDiff3 is installed in
C:Program Files (x86)KDiff3kdiff3.exe
Hitting enter will launch the KDiff3 as the merge tool KDiff3 shows nice GUI to do the merge easily. It shows the original file on the leftmost window called 'A' or 'Base', local file in the middle called 'B' or 'Local' and remote file in the rightmost window called 'C' or 'Remote'. The KDiff3-preferences (menu 'Settings'-'Configure KDiff3') has a section called 'Directory Merge' with these options: Recursive Directories: Select whether to search directories recursively. I have an intermittent problem when I try to use an external diff tool (namely KDiff 3 on Windows 10) with sourcetree. In a usual merge scenario between branches, one file have a conflict. I start KDiff3 using the usual 'Resolve Conflict - Use external diff tool', the tools pops up, and then does it's magic.
In this article we will learn to configure external diff and merge tools for git difftool and git mergetool commands. External tools can make developer’s life easy, to compare changes before committing or resolving conflicts.
I merged a feature branch in master and have a merge conflict.
I rightclick on my file and select
Resolve Conflicts / Launch external merge tool.
It creates a number of files:
Sourcetree Kdiff3 Not Launching
But it does not launch KDiff3.
Thanks for assistance.
SRCTREEWIN-685SourceTree does not open KDiff3
- Steve Streeting (Inactive)
- 1Vote for this issue
- 2Start watching this issue