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

13 votes134 views2 answers
Mongodb show database command linux
Shell/Bash
13 votes169 views6 answers
Ubuntu open file from terminal
Shell/Bash
1 vote130 views1 answer
Deny directory listing htaccess
Shell/Bash
0 vote147 views1 answer
Uninstall laptop mode tools elementary os
Shell/Bash
0 vote141 views1 answer
Fix dual boot time ubuntu
Shell/Bash
4 votes132 views3 answers
Module not found: Can't resolve ''
Shell/Bash
0 vote140 views1 answer
> git checkout -q error: you need to resolve your current index first
Shell/Bash
0 vote191 views1 answer
Freetype2 linux install
Shell/Bash
0 vote135 views1 answer
Ubuntu 14 Some index files failed to download. They have been ignored, or old ones used instead.
Shell/Bash
15 votes130 views2 answers
Install github desktop ubuntu
Shell/Bash