KDiff3

I usually use KDiff3 when viewing the differences between files and merging stuff together. But from time to time I’ve found vimdiff to be a nice alternative, especially when I’m logged in through SSH on a server. The problem is I don’t use it that often so I tend to forget the key combinations. So […]