Tag Archives | git

Setting up kdiff3 for git on windows

Install kdiff3 (I use the version bundled with TortoiseHg). 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" merge! git mergetool

Comments { 0 }