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

1 vote274 views1 answer
How to kill apache process in linux
Shell/Bash
0 vote336 views1 answer
ZTC ZEM800 telnet password
Shell/Bash
5 votes284 views4 answers
Git update branch from master
Shell/Bash
0 vote259 views1 answer
Git replace branch with another
Shell/Bash
1 vote254 views2 answers
Setting up yarn on my mac
Shell/Bash
0 vote266 views1 answer
Raspbian buster mit uv4l
Shell/Bash
0 vote267 views1 answer
Workspace switch shortcur Gnome
Shell/Bash
0 vote289 views1 answer
Windows 10 open git bash here
Shell/Bash
0 vote284 views1 answer
Virtualenvwrapper-win cannot workon powershell
Shell/Bash
-2 votes309 views3 answers
Should you use docker on linux
Shell/Bash