vimdiff.md

Vimdiff for newbies

vimdiff source1 source2

dp diffput: puts changes under the cursor in the other file
do diffget: (o => obtain) replace the change under the cursor by the content of the other file

[c jump to the previous diff
]c jump to the next diff