Setting up kdiff3 for git on windows

  1. Install kdiff3 (I use the version bundled with TortoiseHg).
  2. run the following commands in the git bash:
    git config --global merge.tool kdiff3
    git config --global mergetool.kdiff3.path "C:\Program Files\TortoiseHg\kdiff3.exe"
  3. merge!
    git mergetool
No comments yet.

Leave a Reply