The diff view with all the features of the normal editor is actually amazing. I've always derided people using a GUI for version control but here I am.

EDIT: derided is a strong word :) just good to learn the command line version before moving to shortcuts