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 vote131 views1 answer
Add all the files to staging which will be then be added to the commit.
Shell/Bash
0 vote103 views1 answer
Bash mkdir multiple
Shell/Bash
0 vote121 views1 answer
Win kex kali linux
Shell/Bash
2 votes105 views1 answer
Range of random numbers bash
Shell/Bash
1 vote108 views1 answer
Htaccess all requests goes to index.php
Shell/Bash
1 vote112 views1 answer
Yarn .gitignore for Zero Installs
Shell/Bash
0 vote105 views1 answer
How to check is heroku git remote is added
Shell/Bash
0 vote102 views1 answer
Ryu-manager install ubuntu
Shell/Bash
1 vote103 views1 answer
Git submodule update authentication
Shell/Bash
1 vote100 views1 answer
Grep docker logs
Shell/Bash