I’m looking for a cmd line base diff editor to be used in Linux. It should allow me to edit in VIM mode (can use my VIM shortcuts etc), while at the same time have features like viewing files side-by-side, navigating to previous/next edit etc.
It would be great if it didn’t require X server i.e. could use it directly from putty !!
That sounds like vimdiff. I assume you get it with vim because I’ve never installed it manually.