P4Merge!

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

P4Merge alternatives

  • 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 and ignore those you're not. You can then merge the changes, synchronize your files, and generate reports for your records.

    tags: compare-pdf diff explorer-integration file-compare file-synchronization
  • 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 line by line and character by character, provides an automatic merge-facility, has an editor for comfortable solving of merge-conflicts, provides networktransparency via KIO, has options to highlight or hide changes in white-space or comments, supports Unicode, UTF-8 and other file encodings, prints differences, supports version control keyword and history merging. ยป

    tags: Discontinued diff file-compare folder-compare hex-viewer
  • 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 build WinMerge from sources using Visual C++ Express editions.

    tags: Portable file-compare folder-compare ftp-support
  • 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:- Standalone application start is two times faster;- Opening a file comparison document in Visual Studio is two times faster;- Considerable acceleration of the first environment start after installing Code Compare.

    tags: diff file-compare file-diff
  • 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 present the differences in an easy to read line by line and char by char basis.

    tags: Portable accurate diff diffing file-compare
  • DiffMerge

  • DiffMerge is a graphical file comparison program for Windows, Mac OS X and Unix, published by SourceGear.* Integrates with Windows Explorer; adds a shortcut to the context menu.* Compatible with different character encodings, including Unicode support.* Performs a side-by-side comparison of two folders.* Supports comparison of three files.

    tags: Discontinued configurable explorer-integration file-compare file-diff
  • Araxis Merge

  • Merge is the visual file comparison (diff), merging and folder synchronization application from Araxis. Use it to compare and merge source code, web pages, XML and other text files with native application performance. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files. Compare images and binary files. Synchronize folders. Perform code reviews and audits. Work with folder hierarchies containing thousands of files. Merge integrates with many SCM (version control) systems and other applications. ยป

    tags: binary-comparison file-compare folder-compare folder-sync merging
  • FileMerge

  • FileMerge is part of Xcode .

    tags: developer-tools diff
  • 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
  • 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
  • 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 to edit the file contents.

    tags: file-compare file-merging
  • DeltaWalker

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

    tags: compare-pdf diff file-compare file-synchronization folder-compare