Microsoft Internet Explorer 10 Design: 10 Essential Features - Enterprise Applications - News & Reviews - eWeek.com

I saw how to do this on but the information was out of date.

• Download and install diffmerge.

I used this link: DiffMerge.

• Verify you can run it from the command line:

• Run the following commands from the git command line

   
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'sgdm "$LOCAL" "$REMOTE"'
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'sgdm --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'
git config --global mergetool.diffmerge.trustExitCode true

• Now use the standard git commands for launching diffs and merges

   
git difftool filename.ext
git difftool branchname filename.ext
git mergetool

Note:  I had to perform these steps twice.  Once running the git command line under admin and once under user.  There are times I need to run as admin and it uses a different global config file location.