benv666

Keybase proof

I hereby claim:

• I am benv666 on github.
• I am benv666 (https://keybase.io/benv666) on keybase.
• I have a public key whose fingerprint is EBA3 23D0 0F2B B457 19AF 335C 33DA 77A6 6394 4400

To claim this, I am signing this object:

benv666

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)