1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
Diffuse
Version 0.3.4
Copyright (C) 2006-2009 Derrick Moser <derrick_moser@yahoo.com>
----
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
- Unicode support
- unlimited undo
- easy keyboard navigation
----
Requirements:
- Python >= 2.4
- PyGTK >= 2.10
----
Diffuse is implemented entirely in Python and should run on any platform with
Python and PyGTK. If you need to manually install PyGTK, please be aware its
dependencies should be installed prior to installing PyGTK.
Diffuse can be run directly from an untared source distribution on any POSIX
system or installed with the instructions described in the next section.
The rules for parsing files in ~/.diffuse have changed in the 0.3.0 release.
Non-fatal errors may be reported when parsing old files. These errors can be
fixed by removing the offending lines (or the entire file) from
~/.diffuse/diffuserc. Errors in ~/.diffuse/config will be automatically fixed
when Diffuse exits.
----
Installing on POSIX systems:
Run the 'install.py' script to install Diffuse. The script accepts several
options for customising the installation behaviour. Use the '--help' option
to obtain a full listing.
Diffuse can be removed by running the 'install.py' script with the '--remove'
option.
Specify the '--destdir=' and '--files-only' options for the 'install.py'
script when using it to build a platform specific package of Diffuse.
----
Installing on Windows:
The 'windows-installer' directory contains scripts for building an installable
package for Windows that includes all dependencies.
----
Help Documentation:
Diffuse's help documentation is written in the DocBook format and can be easily
converted into other formats using XSLT stylesheets. If the local help
documentation or its browser are unavailable, Diffuse will attempt to display
the on-line help documentation using a web browser.
|