(6)
Your rating: Now say why...
- 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
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.
- 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
Intel, Mac OS X 10.6 or later
DiffMerge User Discussion (Write a Review)
Overall:
(6)
(6)
| Downloads:13,111 |
| Version Downloads:1,655 |
| Type:Business : Applications |
| License:Free |
| Date:22 Dec 2011 |
| Platform:Intel |
| Price:Free |
Overall (Version 3.x):  |
Features: |
| Ease of Use: |
| Value: |
| Stability: |
-
-
-
DiffMerge is an application to visually compare and merge files.
Product Features
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.
Copyright © 2012 MacUpdate LLC
- -
+63
+63
-2
+7
+7
+32
diarbyrag reviewed on 14 Apr 2009
thankyou to the developers for such a great free program
+1
+9
Bozo Clown reviewed on 14 Jun 2008
+1
+91
ean reviewed on 10 Oct 2007
-1
+5
Bpm rated on 25 Jan 2012
mapetek rated on 13 Jan 2012
+5
Dan1983 rated on 20 May 2011