![]() (see WinMerge Command-line options) git difftool "$PROGRAMFILES/WinMerge/WinMergeU.exe" -e -u -dl "Local" -dr "Remote" "$1" "$2" With winmerge.sh stored in a directory part of your PATH: #!/bin/sh ![]() The first part (using winmerge) is described in " How do I view ‘git diff’ output with visual diff program?" C:\myGitRepo>git config -replace -global diff.tool winmergeĬ:\myGitRepo>git config -replace -global "winmerge.sh \"$LOCAL\" \"$REMOTE\""Ĭ:\myGitRepo>git config -replace -global difftool.prompt false Git 2.5 (Q2, 2015) is now aware of Winmerge as a diff or merge tool! As detailed in " git mergetool winmerge", a simple git config diff.tool winmerge will be enough.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |