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

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

Branch: pkgsrc-2010Q4, Version: 0.4.4nb1, Package name: diffuse-0.4.4nb1, 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:
[lang/python26] [x11/py-gtk2]

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

Master sites:

SHA1: 4689c13a11a182f9230bd394f4050b656d3d1476
RMD160: e507ca2c9002cd7e66d42de0d592c4c283fb0aa9
Filesize: 142.921 KB

Version history: (Expand)