although the settings for KDiff3 are properly done:
.gitconfig:
[merge]
tool = sourcetree
[diff]
tool = sourcetree
:::
[difftool "sourcetree"]
cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
Selecting the DIFF action for a file launches Kdiff3.exe!
Seems that SourceTree does not read the value from .gitconfig for mergetool or uses a default because something is still wrong with the mergetool cmd?!?
OS: Windows
Any idea?
Thanks
Hi Mike,
almost right. The settings are configured for KDiff3 for both Diff Tool AND Merge Tool.
But as Merge Tool always "Visual Merge" is launched instead of KDiff3.
For Diff Tool the configured KDiff3 is launched.
Question: Why is "Visual Merge" launched as Merge Tool although KDiff3 is configured properly?
Thanks
Rufus
Hmmm... maybe I'm misunderstanding, but those settings values are correct? The config says "launch kdiff3" and kdiff3 is launched, right? What is the tool you're expecting to be launched?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.