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

9 votes191 views3 answers
Bash: pip: command not found
Shell/Bash
0 vote190 views1 answer
Ros ubuntu20
Shell/Bash
2 votes184 views1 answer
Docker force a rebuild
Shell/Bash
1 vote186 views1 answer
Add flutter project to github
Shell/Bash
0 vote177 views1 answer
Findspark:install
Shell/Bash
1 vote200 views1 answer
Node js nodemailer Error: Invalid login: 535-5.7.8 Username and Password not accepted.
Shell/Bash
0 vote202 views1 answer
Lightweight Javascript DB for use in Node.js
Shell/Bash
3 votes182 views2 answers
It is required that your private key files are NOT accessible by others ubuntu
Shell/Bash
0 vote170 views1 answer
Debian buster install twemproxy
Shell/Bash
1 vote239 views1 answer
Terminal find file by extension recursive
Shell/Bash