Add kdiff3 to git

[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false
[diff]
    guitool = kdiff3
[difftool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false

Source: stackoverflow.com

Add kdiff3 to git

# configure your windows envrionment 
# download from https://download.kde.org/stable/kdiff3/

git config --global merge.tool kdiff3
git config --global mergetool.kdiff3.path "C:/Program Files/KDiff3/bin/kdiff3.exe"
git config --global mergetool.kdiff3.trustExitCode false

git config --global diff.guitool kdiff3
git config --global difftool.kdiff3.path "C:/Program Files/KDiff3/bin/kdiff3.exe"
git config --global difftool.kdiff3.trustExitCode false

# configure ubuntu
sudo apt install kdiff3

git config --global merge.tool kdiff3
git config --global mergetool.kdiff3.path "/usr/bin/kdiff3"
git config --global mergetool.kdiff3.trustExitCode false

git config --global diff.guitool kdiff3
git config --global difftool.kdiff3.path "/user/bin/kdiff3"
git config --global difftool.kdiff3.trustExitCode false

# to invoke merge run
git mergetool --tool=kdiff3

Source: stackoverflow.com

Similar codes

0 vote144 views1 answer
Cost accounting gitman
Shell/Bash
0 vote152 views2 answers
$ git update-index --chmod +x ./scripts/moveFile.sh
Shell/Bash
0 vote141 views1 answer
Powershell alternative &&
Shell/Bash
0 vote132 views1 answer
Scale variable with bc
Shell/Bash
0 vote137 views1 answer
How to zip a folder in ubuntu 20.04
Shell/Bash
0 vote134 views1 answer
The sandbox is not in sync with the podfile.lock. run 'pod install' or update your cocoapods
Shell/Bash
0 vote119 views1 answer
Powershell tab (bash style)
Shell/Bash
1 vote130 views1 answer
Chkconfig httpd on Amazon Linux 2 AMI
Shell/Bash
-2 votes131 views1 answer
Delete branch on bitbucket
Shell/Bash
2 votes124 views2 answers
Rsync only updated files
Shell/Bash