Help MacUpdate by , and win an iPod!
|
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.

WHAT'S NEW
Version 3.2:
  • Added the ability to switch between vertical and horizontal panel layout in File Diff and File Merge windows. Previously, file panels in these windows were shown side-by-side with a vertical splitter between them. You can now toggle between that mode and horizontal mode, where panels are shown above and below. This is useful when your files have long lines and you can’t see the entire line without horizontally scrolling.

  • We now detect binary files (files containing a NUL byte) and give a warning and stop. This keeps us from showing artifically truncated files in the windows.

  • Made the “multi-line intra-line analysis” adjustable for performance reasons. A setting for this can be found on the “Detail Level” page of the Options dialog. There is a large discussion on this feature in the DiffMerge manual.

  • Added External Tool feature. DiffMerge can now be configured to invoke an external, third-party tool for various types of files (based upon the file suffixes). This allows you, for example, to select special tools for XML or Word documents. You can then double-click on a pair of files in a folder window and have the external tool launched to compare them. For more details see the DiffMerge Manual.

Full release notes
REQUIREMENTS
Mac OS X 10.3.9 or later.


Developer:SourceGear LLC.
Downloads:3,091
  - Version d/l:1,484
Business:Applications
License:Free
Date:30 May 2008
Platform:PPC/Intel
OTHER PEOPLE SUGGEST
Suggest something else:
DiffMerge User Reviews (2 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
0
[ 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
0
[ Reply ]