I've been trying to set up git on Windows.  It's a pain for me for some reason.  Lots of stuff not there by default (I'm using the MINGW32 hosted version) that does seem to be in the Mac package.

Now I just have to figure out how to link to git difftool.  /sigh

Core Dump: Quick and Dirty : Vimdiff Tutorial:
Keyboard Shortcuts:

do - Get changes from other window into the current window.

dp - Put the changes from current window into the other window.

]c - Jump to the next change.

[c - Jump to the previous change.

Ctrl W+ Ctrl W - Switch to the other split window.

Labels: , ,