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 vote181 views1 answer
Maven test with debug
Shell/Bash
-1 vote172 views1 answer
Cudnn version linux
Shell/Bash
0 vote190 views1 answer
Scp copy a remote folder
Shell/Bash
0 vote164 views1 answer
Shell script function read
Shell/Bash
7 votes198 views4 answers
Kill port linus
Shell/Bash
1 vote256 views1 answer
Check active ssh connections on linux
Shell/Bash
0 vote165 views3 answers
Linux ejecutar en segundo plano
Shell/Bash
0 vote164 views1 answer
Does jupyter notebook come with anaconda in ubuntu
Shell/Bash
0 vote169 views1 answer
Piping commands 1
Shell/Bash
14 votes171 views1 answer
Remove angular cli
Shell/Bash