Comment by hatradiowigwam

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