Skip to content

Instantly share code, notes, and snippets.

Avatar

Matt Ratleph mattratleph

View GitHub Profile
@mattratleph
mattratleph / vimdiff.md
Last active Oct 21, 2020 — forked from roothybrid7/vimdiff_cheet.md
vimdiff cheat sheet
View vimdiff.md

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)
You can’t perform that action at this time.