Notes on resolving differences between two documents with the built-in resources of Vim and Emacs
1 What are we talking about? 2 The test documents. 3 Vim and the vimdiff function. 4 The “vimdiff” interface. 5 Emacs and the “ediff” function. 6 How do you use ediff ? 7 The “ediff” Interface. 8 Summary table. 1 What are we talking about? In this article, I report my practical experience on how to use the built-in resources of Vim and Emacs to resolve and undo differences between two documents. In fact, I’ve occasionally updated two documents in such a “messy” way that I could no longer remember which updates to keep on one and the other. Both Vim and Emacs offer very simple and effective built-in tools for checking and resolving such differences. All operations were performed in a GNU/Linux environment, specifically Ubuntu and Arch. I do not mention any additional plugins in the article, although they exist, and I do not address the issue of version control with git . There is no “merit opinion” on the two writing systems, just a concise exposition of t...