One possible merge tool for windows is kdiff3 which works great. after installing kdiff3 git needs to be set up. This blog post describes it (http://www.blog.project13.pl/index.php/coding/1192/setup-git-on-windows-to-use-kdiff3-as-its-mergetool/) but its repeated here: add the following to .gitconfig [merge] tool=kdiff3 [mergetool “kdiff3”] path = C:/Program Files/KDiff3/kdiff3.exe keepBackup = false trustExitCode = false
Tags: .gitconfig, git mergetool, kdiff3
Possible merge tools: kdiff3 and meld Setup kdiff3 in git git config –global difftool.prompt false git config –global difftool.kdiff3.trustExitCode false git config –global diff.tool kdiff3 git config –global mergetool.kdiff3.trustExitCode false git config –global mergetool.keepBackup false git config –global merge.tool kdiff3 When forming a merge command the following variables can be used (This should however not […]
Tags: git, git diff, git difftool, git merge, git mergetool, kdiff3, meld