DiffMerge 1.0.6
DiffMerge is an utility to compare and synchronize folders, compare and merge files. Take control of your source code, web pages and other files with DiffMerge. Use it to compare, understand and combine different file versions.DiffMerge is highly useful for software developers, web designers and other professionals. The tight integration between folder and file comparisons make it easy to identify and review every change in every source file, even when comparing source hierarchies containing thousands of files.
Whether you are working with multiple revisions of files or need to keep multiple folder hierarchies in sync, DiffMerge could help save time and reduce errors by helping you to work quickly and accurately.
DiffMerge supports folder hierarchy comparison and synchronization, enabling you to compare and merge entire directory trees. This is ideal for detecting changes in different versions of source code or web pages.
You can even use the efficient byte-by-byte comparison option to check the integrity of recordable CDs.
DiffMerge enables you to compare and work with different revisions of text files, such as program source code, XML and HTML files. It supports ASCII, MBCS and Unicode. A color-coded side-by-side comparison makes it easy to pinpoint at a glance similarities and differences between files.
DiffMerge shows detailed highlights of changes within lines. It can be configured to ignore differences in whitespace, comments, line endings and character case, as well as changes in lines matching specified regular expressions. The latter is useful for ignoring unimportant changes such as timestamps or expanded version control keywords.
The in-place editor with unlimited undo enables complete control over the merged file as you create it.
You can create comparison reports in HTML format with support for syntax highlighting. HTML reports are particularly useful for archiving and distribution.
Type : Shareware ($29.95) » EULA
OS Support : Windows All
Date / Size : Nov, 25. 2006 / 1139 kBytes
Requirements : unspecified
Distribution permissions for DiffMerge
License/Copyright
Software license agreement
This user license agreement (the "AGREEMENT") is an agreement between you (individual or single entity) and Potato.
The SOFTWARE is the property of Potato and is protected by copyright laws and international copyright treaties.
Trial version
If you accept the terms and conditions of this AGREEMENT, you have certain rights and obligations as follows:
You may:
1. Install and use the unlimited number of copies of the Trial VERSION.
2. Use one or more copies of the Trial VERSION for evaluation purposes only.
3. Copy and distribute freely the Trial VERSION (see `DISTRIBUTION`).
You may not:
1. Sublicense, rent or lease the Trial VERSION or any portion of it (unless you are an authorized reseller/partner).
2. Decompile, disassemble, reverse engineer or modify the Trial VERSION or any portion of it.
Distribution:
You are hereby licensed to make as many copies of the Trial VERSION as you wish and distribute them to anyone provided that all files are intact. You must distribute the install form of the Trial VERSION (not the files resulting of an installation). You are not allowed to sell the Trial VERSION (except for shipment and handling charges). Computer`s Magazines are authorized to distribute it on any Cover Disk or CD-ROM without any permission. Please inform us by e-mail each time you distribute the Trial VERSION.
Warranty disclaimer:
The SOFTWARE is supplied "AS IS". Potato disclaims all warranties, expressed or implied, including, without limitation, the warranties of merchantability and of fitness for any purpose. The user must assume the entire risk of using the SOFTWARE.
Disclaimer of damages
Potato assumes no liability for damages, direct or consequential, which may result from the use of the SOFTWARE, even if Potato has been advised of the possibility of such damages. Any liability of the seller will be limited to refund the purchase price.
Software license agreement
This user license agreement (the "AGREEMENT") is an agreement between you (individual or single entity) and Potato.
The SOFTWARE is the property of Potato and is protected by copyright laws and international copyright treaties.
Trial version
If you accept the terms and conditions of this AGREEMENT, you have certain rights and obligations as follows:
You may:
1. Install and use the unlimited number of copies of the Trial VERSION.
2. Use one or more copies of the Trial VERSION for evaluation purposes only.
3. Copy and distribute freely the Trial VERSION (see `DISTRIBUTION`).
You may not:
1. Sublicense, rent or lease the Trial VERSION or any portion of it (unless you are an authorized reseller/partner).
2. Decompile, disassemble, reverse engineer or modify the Trial VERSION or any portion of it.
Distribution:
You are hereby licensed to make as many copies of the Trial VERSION as you wish and distribute them to anyone provided that all files are intact. You must distribute the install form of the Trial VERSION (not the files resulting of an installation). You are not allowed to sell the Trial VERSION (except for shipment and handling charges). Computer`s Magazines are authorized to distribute it on any Cover Disk or CD-ROM without any permission. Please inform us by e-mail each time you distribute the Trial VERSION.
Warranty disclaimer:
The SOFTWARE is supplied "AS IS". Potato disclaims all warranties, expressed or implied, including, without limitation, the warranties of merchantability and of fitness for any purpose. The user must assume the entire risk of using the SOFTWARE.
Disclaimer of damages
Potato assumes no liability for damages, direct or consequential, which may result from the use of the SOFTWARE, even if Potato has been advised of the possibility of such damages. Any liability of the seller will be limited to refund the purchase price.
Featured Vista Files
NoClone - Find and Delete TRUE duplicate files by byte-to-byte comparison. Smart Marker helps to clean up hard drive.
LittleLite LLMd5Sum is a simple md5sum generator with SHA1 and MD5 support.
The complete hard disk space manager for Windows 200X/XP/Vista. Scans directory trees and stores structure and size in SQL database. Report of space usage, growth and more in tabular views, bar, pie, line chars, tree map. Integrated file search.
Recover My Files Data Recovery Software is a powerful Data Recovery, Disk Recovery and File Recovery tool. Recover deleted files, including DOC, XLS, JPG, digital photos, ZIP, RAR, DBX, PST, email, MP3, MPEG and more. FREE Preview of deleted files.
Smart CD Catalog will help you organize your personal database with all your discs in it, saving time and solving the problem of organzing your discs! View the contents of your discs without inserting them into the CD drive!