I&#39;m just starting to work with Git.  I would like to use TortoiseMerge as the difftool and mergetool.

In my `$HOME/.gitconfig` I have the following sections. I&#39;ve removed the user and color sections for this question.

    [merge]
    	tool = tortoisemerge
    [mergetool &quot;tortoisemerge&quot;]
    	cmd = \&quot;TortoiseMerge.exe\&quot; -base:\&quot;$BASE\&quot; -mine:\&quot;$LOCAL\&quot; -theirs:\&quot;$REMOTE\&quot; -merged:\&quot;$MERGED\&quot;
    [diff]
    	tool = tortoisemerge
    [difftool &quot;tortoisemerge&quot;]
    	cmd = \&quot;TortoiseMerge.exe\&quot; -base:\&quot;$BASE\&quot; -mine:\&quot;$LOCAL\&quot; -theirs:\&quot;$REMOTE\&quot; -merged:\&quot;$MERGED\&quot;

If I type tortoisemerge at the Git Bash prompt it loads. It is known to be on the path. But if I type the command I get the following error.

    Rich:mygittest (master *)
    $ git difftool
    error: &#39;tortoisemerge&#39; can only be used to resolve merges
    merge tool candidates: kompare emerge vimdiff
    No known merge resolution program available.
    external diff died, stopping at readme.txt.
    Rich:mygittest (master *)
    $ 

What am I not understanding to make this work?
Tortoisemerge is installed with TortoiseSVN.



All Tortoisegitmerge Solutions on Gang of Coders

Total of 1 Tortoisegitmerge Solutions

Can TortoiseMerge be used as a difftool with Windows Git Bash?