I&#39;m using [Git Extensions][1] and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I&#39;m very fond of Winmerge though and would like to replace KDiff with Winmerge.

In the Git Extensions settings, there are settings to change the Mergetool, but I can&#39;t seem to figure out what syntax I should use and why. There seem to be 4 variables: $BASE, $LOCAL, $REMOTE, $MERGED. It seems that I should pass these to WinMergeU.exe, but with which command line parameters? 

I&#39;ve tried to search for this a few times, but there is no answer that actually seems to work.

  [1]: http://code.google.com/p/gitextensions/

How to use Winmerge with Git Extensions?

I&#39;m trying to recursively compare two Subversion working copy folders using WinMerge.

Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (`.svn` or `_svn`).

Is it possible to somehow exclude the subversion folders from the comparison? Or is there another (free) diff-tool which is able to do this?

How to ignore SVN folders in WinMerge?

Is there a way to use Winmerge inside of git to do Diffs? 


use Winmerge inside of Git to file diff

When you install winmerge after TortoiseSVN it gives you the option of associating winmerge with Tortoise. But if we install TortoiseSVN after winmerge how can we associate Winmerge to be used instead of Tortoise default diff viewer.

How to integrate WinMerge with TortoiseSvn after installation?

I&#39;m trying to integrate WinMerge with Git as I&#39;ve seen others done before on Windows 7 Ultimate.

I&#39;ve followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.

Created a file called winmerge.sh in the root directory of git: C/Program Files (x86)/Git/ with: WinMergeU is the correct location.
    

    #!/bin/sh
    echo Launching WinMergeU.exe: $1 $2
    &quot;C:/Program Files (x86)/WinMerge/WinMergeU.exe&quot; 
    git /e /u /dl &quot;Base&quot; /dr &quot;Mine&quot; &quot;$1&quot; &quot;$2&quot;

and used the following commands.

    git config --global diff.tool winmerge
    git config --global difftool.winmerge.cmd &quot;winmerge.sh \&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;&quot;
    git config --global difftool.prompt false

The error shows up as:

    git config option merge.tool set to unknown tool: winmerge


All Winmerge Solutions on Gang of Coders

Total of 5 Winmerge Solutions

How to use Winmerge with Git Extensions?

How to ignore SVN folders in WinMerge?

use Winmerge inside of Git to file diff

How to integrate WinMerge with TortoiseSvn after installation?

How can I make WinMerge my git mergetool?