Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging.
Yes
- Added support for Subversion 1.7
- Added "Open Commit..." menu item
- "-c" option now works for all supported version control systems
- Fixed a bug that caused the wrong revision to be shown when working on a branch in Mercurial
- Git support distinguishes between staged and unstaged files
- Added syntax highlighting for R files
Reviewing 0.4.1 (Nov 3, 2009)
A good start, but still not ready for 1.0. Looks like it will be a good competitor to WinMerge, although i wonder if this will introduce any better or new features - can't see any yet:
- Won't copy left/right and move to the next change - requires 2 different icon presses/key commands.
- Doesn't compare 2 folders of files.
- Wants to copy each line of changes separately rather than each block of changes (or option of either) unless i select the text first.
- Merge Left then Right function is not explained anywhere. Can't make sense of what it does anyway.
Despite its shortcomings i'll keep watching this with interest.
No comments yet