If you like to use a 3-way merge tool with git then KDiff3 is a great choice. Here is how you can set it up to be used by git.
1. Tell Git to use KDiff3
git config --global merge.tool kdiff3
2. Tell Git how to call KDiff3
git config --global mergetool.kdiff3.cmd "\"C:\\Program Files\\KDiff3\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED"
3. Resolve Conflicts Now when you merge in a branch and have conflicts you can tell git to use kdiff3 to resolve them by using: