3 ms·
Most of the time I use vimdiff to diff 2 files. Also allows you to push/pull differences from one buffer to another.
by Gonzih 12y ago
Most of the time I use vimdiff to diff 2 files. Also allows you to push/pull differences from one buffer to another.
- kolme 12y agoVimdiff also support 3-way diffs. Git integration with fugitive is also worth mentioning. It makes partial committing and cherry picking very easy. Either way, icdiff looks very promising.