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

14 votes112 views1 answer
Push a local branch
Shell/Bash
-1 vote120 views1 answer
Update wsl
Shell/Bash
11 votes104 views1 answer
Install intellij idea on ubuntu 20.04
Shell/Bash
0 vote135 views1 answer
Pipreqs doesn't work
Shell/Bash
1 vote120 views1 answer
Scheduler ubuntu cmd
Shell/Bash
2 votes110 views1 answer
Install idle on ubuntu
Shell/Bash
0 vote116 views1 answer
Ubuntu 20.04 how to stop apache2 from starting on startup
Shell/Bash
1 vote126 views1 answer
Ubuntu bluetooth not turning on
Shell/Bash
0 vote117 views1 answer
Install kubectx
Shell/Bash
0 vote128 views1 answer
Remove spotify for ubuntu
Shell/Bash