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

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

Branch: pkgsrc-2009Q2, Version: 0.3.3, Package name: diffuse-0.3.3, 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] [lang/python25] [sysutils/desktop-file-utils] [x11/py-gtk2] [misc/xdg-dirs] [misc/gnome2-dirs]

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

Master sites: (Expand)

SHA1: e9c19fd00c76ff9d837190621579500bffe5ed03
RMD160: 6a879d5aa5b10fd42ff729f56363eba0ae210df7
Filesize: 94.377 KB

Version history: (Expand)