Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Looking for a diff editor for Perforce on Linux, similar to Beyond Compare? [closed]

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 !!

like image 697
TCSGrad Avatar asked Jan 21 '23 06:01

TCSGrad


2 Answers

That sounds like vimdiff. I assume you get it with vim because I've never installed it manually.

like image 133
Colin Newell Avatar answered Jan 26 '23 01:01

Colin Newell


Perforce has the p4merge for linux, or you can try kdiff3 (KDE based) or meld (gnome based). Personally I prefer meld.

like image 45
Zsolt Avatar answered Jan 26 '23 01:01

Zsolt