I've read about a bajillion Q&A's on this very topic, and followed all the instructions to the letter. But I'm still getting headaches trying to set up Git to diff and merge using WinMerge.
I've taken the following steps using the Git terminal:
git config --global diff.tool winmerge
git config --global difftool.winmerge.cmd "winmerge.sh \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false
I've also set up a script in a directory included in my PATH
variable that reads:
#!/bin/sh
echo Launching WinMergeU.exe: $1 $2
"C:/Program Files/WinMerge/WinMergeU.exe" git /e /u /dl "Base" /dr "Mine" "$1" "$2""
When I execute
git mergetool
In the Git terminal, I see:
Merging:
first.txt
Normal merge conflict for 'first.txt':
{local}: modified
{remote}: modified
Launching WinMergeU.exe:
So it seems to me that the $LOCAL
and $REMOTE
variables aren't passing anything into the winmerge.sh
script. What am I doing wrong here? I have to assume its in the configuration part.