News for hackers. Stuff that matters.
Re:Vis: A Vim-Like Text Editor by dickson on Thursday April 07, 2016 @06:11PM (#11451101)
vimdiff is a mode within vim to compare differences between buffers. It allows side-by-side comparisons like modern GUI diff tools by showing buffers in different 'windows' (vim screen splitting). You could also open multiple window in this mode to make vimdiff behave like a 3-way merge tool. It also has commands to pick hunks from different buffers into the merge buffer.

There are no comments on this comment yet.