Javascript Disabled Detected

You currently have javascript disabled. Several functions may not work. Please re-enable javascript to access full functionality.

Is this your freeware software? Submitter

marko
View other files from this member

READ / WRITE REVIEW File Information

Submitted: Nov 20 2010 07:48 AM
Last Updated: Nov 20 2010 07:48 AM
File Size: 6.5MB
Views: 987
Downloads: 9
Will Run On: 2000/XP/2003/Vista/7
Author's Site: Click Here

Diffuse

1 Votes

Download Now

0

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.
It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

Features

ability to compare and merge an arbitrary number of files side-by-side (n-way merges)
line matching can be manually corrected by the user
ability to directly edit files
syntax highlighting
Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
support for UTF-8 encoded unicode
unlimited undo
easy keyboard navigation

Scanned & Checked: Nov 20 2010 07:48 AM

When we last updated Diffuse, we made sure it was still virus and malware free and the developer's site had no proven issues in any of the reputable site advisory services. In the unlikely event you notice any issues, please let us know immediately, otherwise we will schedule this software for another scan the next time it is updated.