{"id":289,"date":"2011-10-12T17:44:23","date_gmt":"2011-10-12T16:44:23","guid":{"rendered":"https:\/\/ridgesolutions.ie\/?p=289"},"modified":"2011-10-12T17:44:23","modified_gmt":"2011-10-12T16:44:23","slug":"winmerge-as-git-difftool-on-64bit-windows-7","status":"publish","type":"post","link":"https:\/\/www.ridgesolutions.ie\/index.php\/2011\/10\/12\/winmerge-as-git-difftool-on-64bit-windows-7\/","title":{"rendered":"Winmerge as Git Difftool on 64bit Windows 7"},"content":{"rendered":"

Every software developer’s day to day tasks includes keeping their software development tools up to date and running smoothly, today I got tired of viewing git differences in the raw and decided to hook winmerge<\/a> up for viewing diffs. <\/p>\n

 <\/div>\n

Instructions for setting winmerge<\/a> up as your Git<\/a> difftool can be found here:<\/p>\n

 <\/div>\n

http:\/\/stackoverflow.com\/questions\/255202\/how-do-i-view-git-diff-output-with-visual-diff-program\/949242#949242<\/a><\/p>\n

 <\/div>\n

I tried to apply these instructions on Windows 7 64bit and had to make 2 changes to get it to work.<\/p>\n

 <\/div>\n

Change this command (run in git bash):<\/p>\n

 <\/div>\n

[code]
\ngit config –global difftool.winmerge.cmd “winmerge.sh \\”$LOCAL\\” \\”$REMOTE\\””
\n[\/code]<\/p>\n

 <\/div>\n

to this:<\/p>\n

 <\/div>\n

[code]
\ngit config –global difftool.winmerge.cmd ‘winmerge.sh “$LOCAL” “$REMOTE”‘
\n[\/code]<\/p>\n

 <\/div>\n

and in winmerge.sh, change this line:<\/p>\n

 <\/div>\n

[code]
\n“C:\/Program Files\/WinMerge\/WinMergeU.exe” -e -ub “$1” “$2”
\n[\/code]<\/p>\n

 <\/div>\n

to:<\/p>\n

 <\/div>\n

[code]
\n“C:\\Program Files (x86)\/WinMerge\/WinMergeU.exe” -e -ub “$1” “$2”
\n[\/code]<\/p>\n

 <\/div>\n

After making these changes differences were shown in winmerge after issuing the difftool command.<\/p>\n

 <\/div>\n","protected":false},"excerpt":{"rendered":"

Every software developer’s day to day tasks includes keeping their software development tools up to date and running smoothly, today I got tired of viewing git differences in the raw and decided to hook winmerge up for viewing diffs.   Instructions for setting winmerge up as your Git difftool can be found here:   http:\/\/stackoverflow.com\/questions\/255202\/how-do-i-view-git-diff-output-with-visual-diff-program\/949242#949242 […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[165,118,164,163],"class_list":["post-289","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-64bit","tag-git","tag-windows-7","tag-winmerge"],"aioseo_notices":[],"aioseo_head":"\n\t\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t