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

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

Branch: pkgsrc-2010Q3, Version: 0.4.3nb2, Package name: diffuse-0.4.3nb2, 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:
[x11/py-gtk2] [sysutils/desktop-file-utils] [lang/python26]

Required to build:
[x11/xcb-proto] [x11/randrproto] [x11/renderproto] [x11/xproto] [x11/xextproto] [x11/fixesproto] [x11/inputproto] [pkgtools/x11-links]

Master sites:

SHA1: 7d9f52f5c7f503add3cd965f6e82abedd28a7009
RMD160: 905375e998380a2ad59b46c73b7113237f63dc5e
Filesize: 121.399 KB

Version history: (Expand)