Jump to content

Recommended Posts

by6YR.png

DiffMerge is an application to visually compare and merge files and folders on Windows, Mac OS X, and Linux.

• 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, equivalent or different.

• Windows Explorer/Shell Integration: Right-click on any two files or folders in Windows Explorer to diff them immediately.

• Configurable: Rulesets and options provide for customized appearance and behavior.

• International: DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.

• Cross-platform: Identical feature set on Windows, Mac OS X, and Linux.

GaJtk.png

DiffMerge_3.3.2_ENU_inf_addon.cab

Size: 5.81 Mb (6,091,104 bytes)

MD5: 8EEC5373A5ABFC5E6A3A08C7ED8C4B9F

(Note: This addon is ENU only)

Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

×
×
  • Create New...