P4Merge!

The Perforce Merge Tool, P4Merge, provides graphical three-way merging and side-by-side file comparisons.

More Info **Installing P4Eclipse** You must first uninstall any previous version of P4Eclipse before installing a new version; see the requirements section in the P4Eclipse Release Notes http://www.perforce.com/perforce/doc.current/user/p4eclipsenotes.txt.
Next, select and install P4Eclipse from the following update sites: * Eclipse 4.6: http://www.perforce.com/downloads/http/p4-eclipse/install/4.6
* Eclipse 4.5: http://www.perforce.com/downloads/http/p4-eclipse/install/4.5
To install P4Eclipse locally, get the zip file for your installed version of Eclipse: * Eclipse 4.6 http://www.perforce.com/downloads/perforce/r16.1/bin.java/p4eclipse46.zip
clipse 4.5 http://www.perforce.com/downloads/perforce/r16.1/bin.java/p4eclipse45.zip
By installing, you acknowledge

Go to https://www.perforce.com/products/helix-apps/merge-diff-tool-p4merge

P4Merge alternatives

Meld

Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or ...

tags: diff file-compare folder-compare merge-folders merging
platform: Mac OS X Windows Linux BSD Python

WinMerge

WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visu...

tags: Discontinued Portable compare-docx compare-pdf compare-pptx
platform: Windows PortableApps.com Discontinued

Beyond Compare

Beyond Compare allows you to compare files and folders. By using simple, powerful commands you can focus on the differences you're interested in an...

tags: compare-pdf diff explorer-integration file-compare file-synchronization
platform: Mac OS X Windows Linux

kdiff3

KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences li...

tags: Discontinued diff file-compare folder-compare hex-viewer
platform: Mac OS X Windows Linux Discontinued

Compare

Comparison plugin for Notepad++ editor.

tags: diff file-compare npp-plugin side-by-side-comparison
platform: Windows Notepad++

WinMerge 2011

WinMerge 2011 series is a fork of the original WinMerge application that compiles without ATL/MFC dependencies to enable zero-budget developers to ...

tags: Portable file-compare folder-compare ftp-support
platform: Windows Linux PortableApps.com Wine

Code Compare

Code Compare is a free file and folder merge tool from Devart. New version of Code Compare comes with significantly increased startup speed:- Stand...

tags: diff file-compare file-diff
platform: Windows

Diffinity

Diffinity is a diff and merging tool with focus on accurate and easy to read source code diffs. It will compare the content of two files and presen...

tags: Portable accurate diff diffing file-compare
platform: Windows

DiffMerge

DiffMerge is a graphical file comparison program for Windows, Mac OS X and Unix, published by SourceGear.* Integrates with Windows Explorer; adds a...

tags: Discontinued configurable explorer-integration file-compare file-diff
platform: Mac OS X Windows Linux Discontinued

Araxis Merge

Merge is the visual file comparison (diff), merging and folder synchronization application from Araxis. Use it to compare and merge source code, we...

tags: binary-comparison file-compare folder-compare folder-sync merging
platform: Mac OS X Windows

FileMerge

FileMerge is part of Xcode .

tags: developer-tools diff
platform: Mac OS X Xcode

Diffuse

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.

tags: development-xfce file-compare side-by-side-comparison simplicity-feature text-compare
platform: Mac OS X Windows Linux

Kaleidoscope

Use Kaleidoscope to spot the differences in text and image files. Review changes in seconds with the worlds most advanced file comparison application.

tags: comparison diff
platform: Mac OS X

SmartSynchronize

SmartSynchronize is a multi-platform file and directory compare tool. It allows you to compare files or perform 3-way-merges, both with the ability...

tags: file-compare file-merging
platform: Mac OS X Windows Linux

DeltaWalker

Intuitive, multi-platform application for two and three-way visual file and folder comparison. Use DeltaWalker to compare (diff) and merge files an...

tags: compare-pdf diff file-compare file-synchronization folder-compare
platform: Mac OS X Windows Linux