docs:git:using_other_merge_and_diff_tools [hartungdesign.net wiki]

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.

====== using other merge and diff tools ======
If you've installed TortoiseGit, you can use the right click options to work with files.  When inside Cygwin, you have the ability to call other programs too.

===== TortoiseMerge =====
Edit your ~/.gitconfig with the following (adjust path if necessary):
<code>
[merge]
	tool = tortoise
[mergetool "tortoise"]
	cmd = \"c:/Progra~1/TortoiseGit/bin/TortoiseMerge.exe\" /base:\"$BASE\" /theirs:\"$REMOTE\" /mine:\"$LOCAL\" /merged:\"$MERGED\"
</code>

Now when you need to resolve merge conflicts, type this:
<code>
git mergetool
</code>

Each conflict will open in TortoiseMerge

===== WinMerge =====
You can run git diff in an external editor, and/or use git difftool to run the external editor:

**.gitconfig**
<code>
[diff]
	tool = winmerge
	#this runs git diff in external tool
	#external = /cygdrive/h/git-diff-wrapper.sh
[difftool "winmerge"]
	cmd = /cygdrive/h/git-difftool-wrapper.sh \"$LOCAL\" \"$REMOTE\"
</code>

**git-diff-wrapper.sh**
<code>
#!/bin/sh
"C:/Program Files/WinMerge/WinMergeU.exe" -e -ub `cygpath -w $2` `cygpath -w $5` | cat
</code>

**git-difftool-wrapper.sh**
<code>
#!/bin/sh
"C:/Program Files/WinMerge/WinMergeU.exe" -e -ub `cygpath -w $1` `cygpath -w $2` | cat
</code>

===== External Links =====
  * http://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program