mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-29 01:13:08 +00:00
b16d554638
- Limit python version up to 2.7 - Use a space character instead of a tab in 'pkg-descr' file - Define PORTDOCS unconditionally (regardless of DOCS option) - Remove 'COPYING' from PORTDOCS (redundant with LICENSE) - Remove NO_OPTIONS_SORT (does not matter with only four options) - Remove DOCS_DESC and use standard description - Convert 'for' loops from shell to make syntax - Resort and whitespace cleanup - Bump PORTREVISION PR: ports/174806 (based on) Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer)
20 lines
809 B
Plaintext
20 lines
809 B
Plaintext
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, RCS, Subversion, SVK support
|
|
- support for UTF-8 encoded unicode
|
|
- unlimited undo
|
|
- easy keyboard navigation
|
|
|
|
WWW: http://diffuse.sourceforge.net/
|