[hatradiowigwam]

vimdiff is pretty fast, and is likely installed on your linux system without you realizing it.

[flamestro]

Its a great tool, but misses some of the context I needed.