Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Perforce: Linux based 3-way merge/resolve tool? [closed]

I'm looking for a Linux-based tool for 3 way merging/resolving, using Perforce. I'm familiar with vim/vimdiff, but I don't know how/if they can be used for 3 way merging. In either case, do let me know what, according to you, is the best merge/resolve tool on Linux.

For clarity, let me add that I'd prefer a tool which doesn't requires X server i.e. can be used through putty.

like image 859
TCSGrad Avatar asked Mar 14 '11 08:03

TCSGrad


1 Answers

I prefer meld It is powerful yet lightweight and has no KDE deps as Kdiff3 does. Look at official homepage

like image 116
maverik Avatar answered Sep 21 '22 03:09

maverik