(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! WinMerge Portable (by PortableApps.As detailed in " git mergetool winmerge", a simple git config diff.tool winmerge will be enough.It was also the last version to ship with an ANSI version of WinMerge. WinMerge version 2.12.4 was the last version to ship with Microsoft Visual C++ 2005 runtimes that support Windows 95/98/ME/NT. WinMerge version 2.14.0 was the last version to ship with Microsoft Visual C++ 2008 runtimes that support Windows 2000. Other Versions WinMerge 2.14.0 for Windows 2000 Admin rights for the installer (except for Per-user installer).64-bit installer: Microsoft Windows 7 or newer.32-bit installer: Microsoft Windows XP SP3 or newer.
0 kommentar(er)
