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
Get out of venv
Shell/Bash
25 votes192 views6 answers
Git rm cached
Shell/Bash
2 votes180 views2 answers
Server: ERROR: Got permission denied while trying to connect to the Docker daemon socket
Shell/Bash
0 vote237 views1 answer
Remi repo
Shell/Bash
0 vote165 views1 answer
Terminal command to sleep
Shell/Bash
0 vote192 views1 answer
'jest/no-deprecated-functions': Unable to detect Jest version - please ensure jest package is installed, or otherwise set version explicitly
Shell/Bash
-1 vote200 views2 answers
Install youtube-dl in ubuntu
Shell/Bash
43 votes181 views5 answers
How to install pip on mac
Shell/Bash
0 vote175 views1 answer
Download fbreader for ubuntu
Shell/Bash
0 vote185 views1 answer
[email protected]: The engine "node" tailwindcss
Shell/Bash