KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
I'm trying to integrate WinMerge with Git as I've seen others done before on Windows 7 Ultimate. I'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 "C:/Program Files (x86)/WinMerge/WinMergeU.exe" git /e /u /dl "Base" /dr "Mine" "$1" "$2" and used the following commands. git config --global diff.tool winmerge git config --global difftool.winmerge.cmd "winmerge.sh \"$LOCAL\" \"$REMOTE\"" git config --global difftool.prompt false The error shows up as: git config option merge.tool set to unknown tool: winmerge
Tags (comma-separated)
Save Edits
Cancel