DiffMerge
DiffMerge 4.2.0
Your rating: Now say why...

(1) 4

Visually compare and merge files.   Shareware ($39.00)
Add to my Watch List
Email me when discounted
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.
What's New
Version 4.2.0:
  • Added HTML and Text export of file and folder differences to a file.
  • Added new "Export" menu hierarchy.
  • Improved visibility of the selected change within File Diff and Merge windows. Solid side bars are now drawn in addition to the dotted lines and the color was changed to use the selection highlight background color.
  • Added "-ignore_unimportant" option to the command line interface.
  • Added a "quick match" feature to the Folder Window. This is an approximation intended for extremely large media files. If the files are the same size, they are assumed to be equal. These are marked with a "qm" icon rather than the regular "==" icon.
  • Changed Folder Window to use a background thread to scan and compare the contents of the folders. Added a per-window progress bar.
  • Remember details from Page Setup Dialog between runs.
  • Enable SWAP button in all uses of 2-way Open Dialog. Previously this was only visible when the dialog was initiated by Windows Explorer integration.
  • Enable Drag-and-Drop onto DiffMerge File and Folder Windows. These windows now respond to Drop messages and will attempt to open a new window with the dropped files. Only the first 2 items in the drop are recognized and the Open Dialog will be raised first to let you verify the order of the items.
  • Moved the functionality provided by the Find and Go To Line dialogs to a set of controls on the File Window.
  • Have additional fall-back named character encodings in Ruleset.
  • The Folder Window would sometimes not respect the "Allow Default Ruleset" settings when comparing files.
  • Fixed text limit when pasting into the Registration Dialog.
  • Fixed display of omitted lines immediately adjacent to differences in diffs-with-context mode interactively and when exporting unified format output.
  • Cleaned up error message thrown when trying to open binary files.
  • W9384: Upgraded to wxWidgets 3.0.0-rc1 from 2.9.5.
Version 4.2.0:
  • Added HTML and Text export of file and folder differences to a file.
  • Added new "Export" menu hierarchy.
  • Improved visibility of the selected change within File Diff and Merge windows. Solid side bars are now drawn in addition to the dotted lines and the color was changed to use the selection highlight background color.
  • Added "-ignore_unimportant" option more...
Requirements
Intel, OS X 10.6 or later



MacUpdate - DiffMerge




  • DeltaWalker St...
    +6

  • Kaleidoscope
    +4

  • JDiff X
    +3

  • VisualDiffer
    +1

  • DiffFork
    +1

  • Araxis Merge
    +1
DiffMerge User Discussion (Write a Review)
ver. 4.x:
(1)
Your rating: Now say why...
Overall:
(15)

sort: smiles | time
burypromote
CayenneP8314 commented on 08 Nov 2013
I can't open this app - sez it's from an unknown developer & doesn't even give me any options. thoughts?
[Version 4.2.0]

1 Reply

burypromote

-20
Lnr1 replied on 24 Nov 2013
http://support.apple.com/kb/HT5290?viewlocale=en_US&locale=en_US
burypromote
+1

+229

bbw7 reviewed on 23 Jun 2013
This review is for the older version 3.3.2.

It works as advertised. Has all the features I need, and is fairly easy to figure out how to use. The GUI isn't the sleekest thing in the word, so I dock it a star for that.

Also want to point out that a similar, though uglier and more limited application (with GUI) is native to OS X via Xcode, i.e.:

/Applications/Xcode.app/Contents/Applications/FileMerge.app
[Version 4.0.0]


burypromote

+1
M. Tamer Ozsu commented on 20 Jun 2013
The download link does not work. Gives the following error:

This XML file does not appear to have any style information associated with it.
[Version 4.0.0]

4 Replies

burypromote
+1

+229
bbw7 replied on 23 Jun 2013
Yeah, something is up with the MU download link, but that is no reason to give this app a half-star rating. You can leave a comment without a rating by choosing that option once you click the "Write a Review" option (and no, it wasn't me who gave you a frowny face because of this).

The download link at the dev's site does work.

Also, bully for the developer keeping the older, free version available.
I haven't used version 4.0, but the older ver. 3.3 has worked fine for me.
burypromote
-1

+1
M. Tamer Ozsu replied on 23 Jun 2013
I actually don't mind simply indicating the problem. MacUpdate did not take my input until I filled in the star ratings.
burypromote
+1

+229
bbw7 replied on 24 Jun 2013
No, you're not getting the point.

When you first click the "write a review button" and the comment dialog pops up, look on the very top line: there is a menu item box with "Review" as the default option. Click the arrow button on the right of this, and "comment" becomes a choice. Choosing "comment" will then not require a rating to be given.

Try it out. You can always cancel the entire action and input.
burypromote

+100
MacUpdate-Jess replied on 20 Aug 2013
bbw7 is right, and I've cleared the review, converting this to a comment.
burypromote

YuvalLevi reviewed on 26 May 2013
Nice and easy, just as expected from this utility.
However, I cannot send command-arguments with spaces, say if file name contains space, I tried "bla bla.txt", it does not work ..
Will be glad for a fix..
Thanks,Yuval
[Version 3.3.2]

1 Reply

burypromote

+229
bbw7 replied on 23 Jun 2013
Did you try putting in a backslash for each space, i.e. "bla bla .txt"?

As it is essentially channelling a Unix CL function, I assume this is necessary. it may be necessary for other special characters as well, e.g. quotes, double quotes, etc.
burypromote

dbowser reviewed on 22 Feb 2013
Very crude and limited interface.
Only allowed merging one direction.
I miss WinMerge !
[Version 3.3.2]

1 Reply

burypromote

+229
bbw7 replied on 23 Jun 2013
Oops, I guess backslashes won't show up because of the workings of HTML, but trust me, I did put in a backslash between the "a" and the space, i.e. "\"

"bla\ bla.txt"
burypromote
+1

+9

Dmitry Novikov reviewed on 17 Nov 2012
check php files much better than Deltawalker,Kaleidoscope
[Version 3.3.2]


burypromote
+2

+73

Mikael B reviewed on 19 Sep 2012
Very useful, only drawback is you need a file system integrated service like ftp for comparing to files on server. This is not major however.
Interface could use a little more elegance but the base function of comparing files and folder content saves me hours of time when I have such problems.
[Version 3.3.2]


burypromote
+2

+2

Djwix reviewed on 28 Apr 2012
Instantly found 3 very minor differences in 3800 lines of PHP code in 2 files. Thanks for a very useful tool.
[Version 3.3.2]


burypromote

+8
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]

4 Replies

burypromote

+263
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

+263
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

+8
fleischner replied on 27 Jul 2011
Okay, thanks for the update.
burypromote

+73
Mikael B replied on 19 Sep 2012
You're doing a great job Ryan.
burypromote
-2

+6
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]

2 Replies

burypromote
-1

+6
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

+156
Markus Winter replied on 21 Sep 2012
No, it is not true. And if you had bothered to look into the manual you would know.
burypromote

+73
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]



Schraep rated on 09 Nov 2012

[Version 3.3.2]



Iranian rated on 12 Aug 2012

[Version 3.3.2]



-1

CPa rated on 27 Mar 2012

[Version 3.3.2]



+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:93,678
Version Downloads:13,090
Type:Business : Applications
License:Shareware
Date:24 Oct 2013
Platform:Intel 64 / Intel 32 / OS X
Price: $39.00
Overall (Version 4.x):
Features:
Ease of Use:
Value:
Stability:
Displaying 1-10 of 13
1 2 >
Displaying 1-2 of 2
Displaying 1-6 of 6
-
-
-
Please login or create a new
MacUpdate Member account
to use this feature
Watch Lists are available to
MacUpdate Desktop Members
Upgrade Now
Install with MacUpdate Desktop.
Save time moving files & cleaning
up space wasting archives.
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.


- -