git: merge.conflictstyle=diff3

In diff3 style, git inserts - along with the normal conflict tags -
a section that shows the common ancestor so that you can see what the
other party has changed to cause the conflict with your changes.

Something like this:

    <<<<<<< yours
    Original code plus your changes.
    |||||||
    Original code.
    =======
    Original code plus their changes.
    >>>>>>> theirs
vim: git: spell commit messages
rc: alias gti=git
rc: show git status in prompt