How can I configure KDiff3 as a merge tool and diff tool for git?

by

These sites were very helpful, almost, mergetool and difftool. I used the global configuration, but can be used by repository without problems. You just need to execute the following commands:

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

Note that the latest version kdiff3 moved the executable from the root of the application folder C:/Program Files/KDiff3 into the bin/ folder inside the application folder. If you’re using an older version, remove “bin/” from the paths above.

The use of the trustExitCode option depends on what you want to do when diff tool returns. From documentation:

git-difftool invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use –trust-exit-code to make git-difftool exit when an invoked diff tool returns a non-zero exit code.

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. When do you use Git rebase instead of Git merge?
  3. How to cherry-pick a range of commits and merge them into another branch?
  4. Why does git perform fast-forward merges by default?
  5. Undo git pull, how to bring repos to old state
  6. How to import existing Git repository into another?
  7. How can I prevent foxtrot merges in my ‘master’ branch?
  8. Resolve Git merge conflicts in favor of their changes during a pull
  9. How can I merge two commits into one if I already started rebase?
  10. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  11. How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
  12. git remove merge commit from history
  13. Get changes from master into branch in Git
  14. tell git to use ours merge strategy on specific files
  15. git merge, keep both
  16. Find unmerged Git branches?
  17. Merging without whitespace conflicts
  18. How can I preview a merge in git?
  19. Is it possible to pull just one file in Git?
  20. Tell git not to merge binary files but to choose
  21. Restart/undo conflict resolution in a single file
  22. Is there a git-merge –dry-run option?
  23. Git merge doesn’t use default merge message, opens editor with default message
  24. How to see commits that were merged in to a merge commit?
  25. Merge, update, and pull Git branches without using checkouts
  26. Merging two remote repositories in Git
  27. Git: Merge a Commit into a different Branch
  28. Restore git files deleted after git merge –abort
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. How do you detect an evil merge in git?

Leave a Comment