Diffuse is a graphical tool for merging and comparing text files, a small and simple text merge tool. With Diffuse, you can easily merge, edit, and review changes to your code. 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.

Diffuse Features:
1. ability to compare and merge an arbitrary number of files side-by-side (n-way merges)
2. line matching can be manually corrected by the user
3. ability to directly edit files
4. syntax highlighting
5. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support
6. support for UTF-8 encoded unicode
7. unlimited undo
8. easy keyboard navigation

Command Line Usage:
diffuse [ [ option ]... [ file ]... ]... Compare and merge files.

General Options
-c, --commit rev
Include revision rev - 1 and rev of the next file named in the command line arguments in a file comparison tab.

-D, --close-if-same
Close all tabs with no differences.

-e, --encoding codec
Use codec to read and write files.

-m, --modified
Open all modified files from the remaining paths specified in the command line arguments in separate file comparison tabs.

-r, --revision rev
Include revision rev of the next file named in the command line arguments in a file comparison tab.

-s, --separate
Open all remaining files specified in the command line arguments in separate file comparison tabs.

-t, --tab
Start a new tab for any remaining files named in the command line arguments.

--null-file
Create a blank file comparison pane.

Display Options
Display options specified in the command line arguments will override saved preference values.

-b, --ignore-space-change
Ignore changes to the amount of white space.

-B, --ignore-blank-lines
Ignore changes whose lines are all blank.

-E, --ignore-end-of-line
Ignore end of line differences.

-i, --ignore-case
Ignore case differences in file contents.

-w, --ignore-all-space
Ignore all white space.

Please Note: this download is pre-built packages for Microsoft Windows include all dependencies.

The license of this software is Free, you can free download and free use this file compare software.