Reputation: 215
I set up Git today to work with GitHub. I want to use tkdiff as my default diff tool. I remember I used it before and it was nice and easy.
I downloaded the zip file from their website and see a tkdif file in the zip. However, I am not sure how to install it. Where do I place the file?
Additionally, what is the correct way to set tkdiff as the default diff/merge tool?
Thank you!
Upvotes: 1
Views: 4018
Reputation: 1323045
tkdiff.exe
to your %PATH%
(where you have uncompressed tkdiff 4.3.5).Configure the tool in Git:
git config --global diff.tool tkdiff
git config --global difftool.tkdiff.cmd "\"C:\\Path\\to\\tkdiff.exe\" -s \"\$LOCAL\" -d \"\$REMOTE\""
Note that tkdiff wiki does not mention any recent Windows support (using TclTk)
So you might want to consider instead kdiff3
, as commented, which does actually has a kdiff3.exe
.
See "Git: How configure KDiff3 as merge tool and diff tool"
Upvotes: 1