Using vim as a diff and merge tool

with Andrej’s article I found some nice tips & tricks and the Vim manual for diff tasks. Some useful commands,

* “vim -o one.txt two.txt three.txt” (for horizontal split), “vim -O one.txt two.txt three.txt ” (for vertical split)
* go to the next diff point ” ]c “; go to previous diff point “ [c “
* merge to original “do“, merge from original “dp“.
Where text highlighted red will display text which doesn’t match from the files being compared.


I am a g33k, Linux blogger, developer, student and Tech Writer for My passion for all things tech drives my hunt for all the coolz. I often need a vacation after I get back from vacation....

Leave a Reply

This site uses Akismet to reduce spam. Learn how your comment data is processed.