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

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

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

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

Master sites:

SHA1: 684891e7a77a5a49a7acaf4e14f69d49d70fa7d1
RMD160: 424734fedb2f154da1e640912affa5bd41d0066a
Filesize: 114.98 KB

Version history: (Expand)