I mostly use the terminal, but for when I need to find stuff I like Sublime Merge.

https://www.sublimemerge.com/