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

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

Branch: pkgsrc-2009Q3, Version: 0.4.0nb1, Package name: diffuse-0.4.0nb1, 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, 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:
[textproc/rarian] [x11/py-gtk2] [sysutils/desktop-file-utils] [lang/python25]

Required to build:
[devel/py-gobject-shared] [x11/randrproto] [x11/fixesproto] [x11/inputproto] [x11/renderproto] [x11/xproto] [x11/xextproto] [pkgtools/x11-links]

Master sites: (Expand)

SHA1: d143c5415c71ac07e9b57ff8b3b79f196bf810ca
RMD160: 91cd8f13e40eb25bccab57c47ea3311e53ed38d9
Filesize: 106.873 KB

Version history: (Expand)