Search Mac Software Downloads
|
MacUpdate Desktop 5     |     Weekly Popular  |  Hot Picks  |  iPhone  |  Mac OS X  |  About     |     Deals: Daily  /  Discount StoreAdd a File +
DESCRIPTION
DiffMerge is an application to visually compare and merge files.

Product Features

  • Diff. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. Merge. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file.
  • Folder Diff. Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different.
  • Configurable. Rulesets and options provide for customized appearance and behavior.
  • International. Compatible with 42 different character encodings.

Download Now
WHAT'S NEW
Version 3.3:
  • Folder Window Equivalence Mode
  • Added support for Fedora Linux
  • When the /result option is used, DiffMerge now exits with an exit status that reflects the state of the merge (MERGE-RESOLVED, MERGE-ABORTED, ERROR, etc.).
  • Added support for saving the contents of a Folder Window to a file. This creates a UTF-8 CSV containing the rows currently displayed in the window (respecting the various Show/Hide toolbar buttons).
  • Support for Explorer Integration (EI) on 64 bit Windows XP and Vista. DiffMerge is still a 32 bit application and runs on 32 and 64 bit systems. However, the EI DLL which hooks into Windows Explorer must be the same bit-ness as the platform. This release contains 2 versions of the DLL.
REQUIREMENTS
Mac OS X 10.3.9 or later.

Bookmark and Share

Developer:SourceGear LLC.
Downloads:5,950
  - Version d/l:1,879
Business:Applications
License:Free
Date:14 Apr 2009
Platform:PPC/Intel
RATING
****½
OTHER PEOPLE SUGGEST
Suggest something else:
DiffMerge User Reviews (3 posts)Write A Review
sort: smiles | time
Jun 14 2008
*****

BOZO CLOWN  Awesome tool! Merge individual files or entire source trees with ease. DiffMerge wins because I can work much more quickly with it than with FileMerge because there's never any doubt what the merged file is going to have in it. The only feature I can think of adding is a context menu option to copy missing files from one tree to the other. Recommended!  
(Version 3.2)

praisebury
+1
[ Reply ]
Oct 10 2007
****.

EAN  Wow. And free. A very nice diff tool. I only wish I could switch the files back and forth between the source and edit panels iin edit mode with out having to reload the files or open another window or anything. It's picky, but the toolbar icons two diff-erent states should be more readily noticable. More contrast in the icon, or something.  
(Version 3.1)

praisebury
+1
[ Reply ]
Apr 14 2009
*****

DIARBYRAG  This program is just what I needed to compare my local copy to a clients online zen cart site. great time saver. works just fine and any differences are easy to find

thankyou to the developers for such a great free program  
(Version 3.3)

praisebury
0
[ Reply ]