./devel/diffuse, Graphical tool for merging and comparing text files

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]

Branch: pkgsrc-2011Q3, Version: 0.4.5, Package name: diffuse-0.4.5, Maintainer: pkgsrc-users

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, RCS, Subversion,
and SVK repositories for comparison and merging.

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


Required to run:
[sysutils/desktop-file-utils] [lang/python26]

Master sites:

SHA1: 46fddd6bb61caaddf9a9a8d691d16cd510b5e37b
RMD160: 126f502c3ac2ce57d99e0ec290fd4009083050a8
Filesize: 164.021 KB

Version history: (Expand)