Diffuse Publisher's description
from Derrick Moser
Diffuse is a graphical tool for comparing and merging text files.
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 the user the ability to manually correct line-matching and to edit the files directly.
Diffuse supports UTF-8 encoded Unicode.
Building from source:
Diffuse uses Trolltech's Qt library for its user interface. The Qt header files and build tools need to be present when compiling diffuse. The QTDIR environment variable should point to the Qt installation root. Please see http://www.trolltech.com/ for information about obtaining Qt.
Diffuse also uses some icons from KDE. It expects to find these icons in the /usr/share/icons/default.kde/22x22 directory. Please see http://www.kde.org/ for information about obtaining KDE.
Configure and build diffuse by running the command:
$ qmake -project && qmake && make
This command should create a single executable. Use diffuse by running this executable with the names of the files you wish to compare or merge as command line arguments.
Here are some key features of "Diffuse":
В· ability to compare an arbitrary number of files side-by-side (all files listed in the command line arguments are opened side-by-side)
В· line-matching can be manually corrected by the user (select a line from one pane then right-click on a line from a neighbouring page and choose "Align to Selection" from the menu)
В· highlighting of character differences
В· support for UTF-8 encoded unicode
В· ability to directly edit files being compared (enter edit mode my double clicking on a text pane; exit edit mode by pressing the ESC key)
What's New in This Release:В· syntax highlighting for .plist, GLSL, SConscript, and SConstruct files
В· status bar now explains how to navigate between modes
В· added labels to indicate syntax highlighting rules, encoding, and format
В· Subversion 1.6 support
В· German translation
В· added \'--examplesdir=\' and \'--mandir=\' options to install.py
В· renamed the \'--python-interpreter=\' installer option to \'--pythonbin=\'
В· minor bug fixes
System Requirements:No special requirements.
Program Release Status:
Program Install Support: Install and Uninstall