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.
I prefer meld It is powerful yet lightweight and has no KDE deps as Kdiff3 does. Look at official homepage
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With