MacUpdate
Join MacUpdate
New Member

New Developer
Explore
MacUpdate Desktop
Hot Apps

Business
Dashboard
Development
Drivers
Education
MacUpdate Promo
Popular Apps

Games
Home & Personal
Internet
Multimedia & Design
Utilities
iPhone
Apps

Login
Member Login

Developer Login
About
Search Mac Apps

Search iPhone Apps

Advanced Search
DiffMerge
DiffMerge 3.3.2
Your rating: Now say why...

(6) 4.75

Visually compare and merge files.   Free
Add to my Watch List
Email me when discounted
  • Download Now
    5 MB
  • Download Older Version
    5 MB (vers. 3.3.0 - OS 10.4)
  • Visit Developer's Site
    SourceGear LLC.
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
What's New
Version 3.3.2:

Core Changes:

  • J6399: Fixed crash in 64-bit versions (observed on Ubuntu 11.04 and 11.10) that happened when launching the Options Dialog.
  • J5726: The Auto-Merge button is now only enabled when the files are first loaded and have not yet been edited. There were some weird cases where it would enable/disable (seemingly at random) while you were typing. Since the Auto-Merge button would probably undo any changes you have already made, it seemed reasonable to disable it and avoid the potential confusion.
  • J3388: Fixed bug where the intra-line highlight of a line with changes would be marked unimportant when it immediately followed a line that ended with a context starting delimiter. For example, in a C++ source file, if a line ended with slash-slash comment (with no whitespace between the slashes and the CRLF or LF), DiffMerge would not respect the ends-at-eol setting on the comment context; the following line would be colored as if the previous line has ended with slash-star.
  • J1202: Fixed crash when using the batch output (--diff) feature, a Ruleset that contains a Lines-to-Omit pattern, and input files that had an added/deleted line immediately following an omitted line.
Changes for Mac OS X:
  • X2475: Fix typo in the README file distributed with the DMG regarding the name of the man-page.
  • J9340: Updated Makefile to force 10.6 SnowLeopard compatibility when building on Mac OS X 10.7 Lion. --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk --with-macosxversion- min=10.6

Version 3.3.2:

Core Changes:

  • J6399: Fixed crash in 64-bit versions (observed on Ubuntu 11.04 and 11.10) that happened when launching the Options Dialog.
  • J5726: The Auto-Merge button is now only enabled when the files are first loaded and have not yet been edited. There were some weird cases where it would enable/disable (seemingly at random) while you were more...
Requirements
Intel, Mac OS X 10.6 or later







  • DeltaWalker
    +2
    Shareware $39.95
    Compare, edit and merge files, ...

  • Changes
    +2
    Shareware $49.95
    Directory comparison and file ...

  • DiffFork
    +1
    Shareware $26
    Text file differencing tool.

  • JDiff X
    +1
    Shareware $16.00
    Document comparison plug-in for ...

  • Araxis Merge
    +1
    Demo $129
    Two and three-way file ...

  • VisualDiffer
    +1
    Commercial $3.99
    Compares side-by-side folders ...
DiffMerge User Discussion (Write a Review)
ver. 3.x:
(6)
Your rating: Now say why...
Overall:
(6)

sort: smiles | time
burypromote

fleischner commented on 26 Jul 2011
This version is NOT compatible with the specs listed. As of this version, it doesn't run on a PPC with 10.5.8.
[Version 3.3.1]

3 Replies

burypromote

+63
MacUpdate---Ryan replied on 26 Jul 2011
I've emailed the developer to clarify the min requirements as their site states 10.4 and a PPC processor. http://sourcegear.com/diffmerge/documentation/sysreq.html
burypromote

+63
MacUpdate---Ryan replied on 27 Jul 2011
So the newest version 3.3.1 is now only compatible with 10.6 or later. I've updated the system requirements to reflect this and added version 3.3.0 (PPC / 10.4) as an alternate download. Sorry about that!
burypromote

fleischner replied on 27 Jul 2011
Okay, thanks for the update.
burypromote
-2

+7
Wikno commented on 01 Jul 2011
Please note: there is NO Folder Merge function... there is FILE merge and folder COMPARE, but not a FOLDER MERGE function.
[Version 3.3]

1 Reply

burypromote

+7
Wikno replied on 06 Aug 2011
? Is this not true? Please reply instead of downrating me. I didn't downrate the app, what's the problem? I would expect more from MU community. Just correct me if I'm wrong, I spent some time playing with this because I was confused and thought it could perform the desired function, perhaps a newer version allows this? Let me know... ?
burypromote

+32

diarbyrag reviewed on 14 Apr 2009
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]


burypromote
+1

+9

Bozo Clown reviewed on 14 Jun 2008
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]


burypromote
+1

+91

ean reviewed on 10 Oct 2007
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]


burypromote

-1
Mikael B had trouble on 05 Nov 2011
How do I set up diffmerge with Mercurial? I use the Murky GUI for some development, but it looks for opendiff.
[Version 3.3.1]


burypromote

neukraal had trouble on 01 Nov 2011
I can't seem to open .doc or .odt files. Are these simply not supported?
[Version 3.3.1]



+5

Bpm rated on 25 Jan 2012

[Version 3.3.2]




mapetek rated on 13 Jan 2012

[Version 3.3.2]



+5

Dan1983 rated on 20 May 2011

[Version 3.3]


Downloads:13,111
Version Downloads:1,655
Type:Business : Applications
License:Free
Date:22 Dec 2011
Platform:Intel
Price:Free0.00
Overall (Version 3.x):
Features:
Ease of Use:
Value:
Stability:
Displaying 1-5 of 5
Displaying 1-2 of 2
Displaying 1-3 of 3
-
-
-
Please login or create a new
MacUpdate Member account
to use this feature
Watch Lists are available to
MacUpdate Desktop Members
Upgrade Now
Download and auto-install
using MacUpdate Desktop. Save
time moving folders and cleaning-up.
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.
Add/Update Listing About MacUpdate Desktop Career Opportunities RSS Twitter Facebook Advertise Sitemap
Copyright © 2012 MacUpdate LLC


- -