I use the open source tool Notepad++ for most of my editing. And then there's a compare plug-in tool that I use - I think it's just called Compare. It's fine, and I'm used to it, so I stick with it.