Diffuse

Free and open source utility that will help you merge and compare text file
Download

Diffuse Ranking & Summary

Advertisement

  • Rating:
  • License:
  • GPL
  • Price:
  • FREE
  • Publisher Name:
  • Derrick Moser
  • Publisher web site:
  • Operating Systems:
  • Mac OS X 10.0 or later
  • File Size:
  • 106 KB

Diffuse Tags


Diffuse Description

Free and open source utility that will help you merge and compare text file 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 CVS, Darcs, Git, Bazaar, Mercurial, Monotone, SVK and Subversion repositories for comparison and merging. Here are some key features of "Diffuse": · 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 Requirements: · Python · PyGTK What's New in This Release: · changed the default hotkeys for merging to reflect the direction text "moves" · added format menu with new items for changing case, sorting, and manipulating white space · replaced 'Hide end of line characters' preference with 'Show white space characters' · errors are now reported in a dialogue instead of printing to stderr · optimized redraws when only the cursor position has changed · input methods that use pre-editing can now be used when editing text · dead keys can now be used when editing text · updated Monotone support to use 'mtn automate inventory' · Git support now handles files flagged as 'unmerged' · graceful handling of and non-zero exit codes from 'git status' · added version control section to the manual · minor bug fixes


Diffuse Related Software