I’ve tried a number of different merge/differencing tools in the past. BeyondCompare, TortoiseMerge, WinMerge, etc…
I’ve never found one that’s as easy to use and as understandable as Meld is. Do yourself a favor and head over to http://meldmerge.org/ and grab yourself a copy. It’s great.
When you’ve got it go ahead and throw this in your git config. (Psst, the command for that is:
git config --global --edit)
[merge] tool = meld [mergetool "meld"] cmd = 'C:/Program Files (x86)/Meld/meld.exe' $REMOTE $MERGED $LOCAL
You’ll probs want to update the path to your Meld exe.