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 vote174 views1 answer
Ubuntu run in port 80
Shell/Bash
0 vote218 views1 answer
Pyinstaller dmg on mac
Shell/Bash
5 votes185 views4 answers
Reload .bashrc
Shell/Bash
12 votes163 views3 answers
Find text in linux file
Shell/Bash
5 votes200 views2 answers
Shell script current time
Shell/Bash
0 vote182 views1 answer
If you are on Ubuntu or Debian, install libgtk2.0-dev and pkg-config, then re-run cmake or configure script in function 'cvDestroyAllWindows'
Shell/Bash
0 vote170 views1 answer
Linux change azert
Shell/Bash
0 vote183 views1 answer
Synology virtual machine install agent
Shell/Bash
0 vote264 views1 answer
Rhythmbox
Shell/Bash
0 vote163 views1 answer
Composer install with dockerfile
Shell/Bash