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
Git 2.5+ (Q2 2015) will include Winmerge as a known git mergetool!
If Winmerge is in your %PATH%, a git config merge.tool winmerge is all you need to do!
(It works for diff tool too: git config diff.tool winmerge)
See commit 3e4f237 by David Aguilar (davvid), 20 May 2015.
(Merged by Junio C Hamano -- gitster -- in commit 324a9f4, 01 Jun 2015)
Helped-by: Philip Oakley (PhilipOakley), Johannes Schindelin (dscho), Sebastian Schuberth (sschuberth), SZEDER Gábor (szeder)
All the config is now done for you directly in Git itself, with mergetools/winmerge:
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE""$merge_tool_path" -u -e -dl Local -dr Remote "$LOCAL" "$REMOTE" "$MERGED"
mergetools: add winmerge as a builtin toolAdd a winmerge scriptlet with the commands described in this thread, so that users can use winmerge without needing to perform any additional configuration.