I sometimes power up Netbeans for one feature - it's local history feature. Any time you save a file, it stores a little diff of the changes and has a very nice

I sometimes power up Netbeans for one feature - it's local history feature. Any time you save a file, it stores a little diff of the changes and has a very nice visual diff function that works with it. The same feature works for history stored in git or svn too. I've not seen this replicated in any other editor as well as with this. It's like having an embedded Meld function. Generally though: Vim, Geany, Atom, Gedit