1
Thank you for your review
$39 00
http://www.macupdate.com/download/39607/diffmerge.3.3.0.1001.dmg
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. Rulesets and options provide for customized more...

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 more...

Requirements

OS X 10.6 or later

Similar Software

Open Comparison
Suggest Other Similar Software
Leave a Review

DiffMerge User Discussion

Nobody has reviewed or commented on this app yet. Add your own comment and get a discussion going!
Sort by: Time | Smiles
CayenneP8314 Member IconComment+0
CayenneP8314
+0

I can't open this app - sez it's from an unknown developer & doesn't even give me any options. thoughts?

Reply1 reply
Version 4.2.0
Lnr1
+0

http://support.apple.com/kb/HT5290?viewlocale=en_US&locale=en_US

bbw7 Member IconReview+313
bbw7
+1

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

Reply0 replies
Version 4.0.0
M. Tamer Ozsu Member IconComment+5
M. Tamer Ozsu
+1

The download link does not work. Gives the following error:

This XML file does not appear to have any style information associated with it.

Reply4 replies
Version 4.0.0
bbw7
+1

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.

M. Tamer Ozsu
+0

I actually don't mind simply indicating the problem. MacUpdate did not take my input until I filled in the star ratings.

bbw7
+1

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.

MacUpdate-Jess
+0

bbw7 is right, and I've cleared the review, converting this to a comment.

YuvalLevi Member IconReview+0
YuvalLevi
+0

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

Reply1 reply
Version 3.3.2
bbw7
+0

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.

dbowser Member IconReview+0
dbowser
+0

Very crude and limited interface.
Only allowed merging one direction.
I miss WinMerge !

Reply1 reply
Version 3.3.2
bbw7
+0

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"

Dmitry Novikov Member IconReview+9
Dmitry Novikov
+1

check php files much better than Deltawalker,Kaleidoscope

Reply0 replies
Version 3.3.2
Mikael B Member IconReview+415
Mikael B
+2

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.

Reply0 replies
Version 3.3.2
Djwix Member IconReview+2
Djwix
+2

Instantly found 3 very minor differences in 3800 lines of PHP code in 2 files. Thanks for a very useful tool.

Reply0 replies
Version 3.3.2
Mikael B Member IconComment+415
Mikael B
+0

How do I set up diffmerge with Mercurial? I use the Murky GUI for some development, but it looks for opendiff.

Reply0 replies
Version 3.3.1
neukraal Member IconComment+0
neukraal
+0

I can't seem to open .doc or .odt files. Are these simply not supported?

Reply0 replies
Version 3.3.1
user icon+0
Schraep
Version 3.3.2
user icon+0
Iranian
Version 3.3.2
user icon+3
CPa
Version 3.3.2
user icon+8
Bpm
Version 3.3.2
user icon+0
mapetek
Version 3.3.2
user icon+6
Dan1983
Version 3.3
> 4 15

Ratings

Overall
(15)
Current Version (4.x)
(1)

Details

Downloads 102,225
Version Downloads 18,652
License Shareware
Date 24 Oct 2013
Platform Intel 64 / OS X / Intel 32
Price $39.00
Learn how MacUpdate Desktop makes installing apps from MacUpdate.com one-click easy.
Next time, install DiffMerge with 1-click

Learn how MacUpdate Desktop can install apps on MacUpdate with the simple click of the Install apps with MacUpdate Desktop icon. Plus, keep all your apps updated. Play video...