KDiff3 can be used as a Git diff and merge tool.
Just add the following lines into your
[diff] tool = kdiff3 [difftool "kdiff3"] path = <path to kdiff3 binary in your system> [difftool] prompt = false keepBackup = false trustExitCode = false [merge] tool = kdiff3 [mergetool] prompt = false keepBackup = false keepTemporaries = false [mergetool "kdiff3"] path = <path to kdiff3 binary in your system>
Then to see the difference between two commits use
second_hash --tool=kdiff3 --cc
To merge a branch with KDiff3 use
branch_name && git mergetool --tool=kdiff3
After resolving merging conflicts in the usual way it is enough to commit the changes to do the job.