views:

472

answers:

1

I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'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'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've tried to search for this a few times, but there is no answer that actually seems to work.

+1  A: 

Found the answer by deriving it from this question (Thanks VonC!)

Mergetool (fill it in yourself):

winmerge

Path to mergetool (default installation folder for winmerge):

C:/Program Files (x86)/WinMerge/WinMergeU.exe

Mergetoool command:

"c:/Program Files/SourceGear/DiffMerge/DiffMerge.exe" /m /r="$MERGED" "$LOCAL" "$BASE" "$REMOTE"

sebastiaan