use Winmerge inside of Git to file diff
Update June 2015, 6 years later: As detailed in “git mergetool winmerge”, a simple git config diff.tool winmerge will be enough. Git 2.5+ (Q2, 2015) is now aware of Winmerge as a diff or merge tool! Original answer (2009-2012) (msysgit, 1.6.5, DOS session) The first part (using winmerge) is described in “How do I view … Read more