Projects / Diffuse

Diffuse

Diffuse is a graphical tool for comparing and merging text files. It can work with many revision control systems as a diff viewer or merge tool. Diffuse is able to compare an arbitrary number of files side-by-side (n-way merge), and gives the user the ability to manually correct line matching and directly edit the files.

Tags
Licenses
Implementation

Recent releases

  •  13 May 2013 13:26

    Release Notes: This release adds Czech and Polish localization, better support for UTF-16 and UTF-32 encoded text, and a new menu item for opening n-way file merges. Syntax highlighting has been added for Erlang and OpenCL files. Several minor bugs were also fixed.

    •  02 Nov 2011 14:45

      Release Notes: This release adds support for Subversion 1.7. The command line option for discovering files modified by a particular commit has been updated to work with all version control systems supported by Diffuse and now has a corresponding menu item. This release also fixes a bug that caused the wrong revision to be shown when working on a branch in Mercurial, and updates Git support to distinguish between staged and unstaged files. Syntax highlighting has been added for R files.

      •  13 Jul 2011 13:56

        Release Notes: Diffuse now includes an Italian localization. Command line arguments to show a label instead of the actual file name (--label or -L) and an option to start the cursor at a given line (--line) have been added. Also new are menu items to go to the first and last tab, syntax highlighting for JSON files, and a preference to display the right margin. Diffuse now uses a patience diff-based algorithm to align lines. State information is now stored in ~/.local/share/diffuse. Several minor bugs were also fixed.

        •  21 Oct 2010 13:34

          Release Notes: Diffuse now includes Korean and Russian localizations. Git support now recognizes conflicts that occur when re-applying the stash. The search dialog is automatically populated with the currently selected text. Shift-ScrollWheel can now be used to scroll horizontally. Pane headers now have tool tips allowing easy viewing of long file names. Several bugs were fixed that prevented Diffuse from working with files containing non-English characters in their paths.

          •  15 Apr 2010 12:29

            Release Notes: A bug was fixed that prevented the "-m" option from opening a 3-way merge for Subversion and Bazaar conflicts.

            Screenshot

            Project Spotlight

            OpenStack4j

            A Fluent OpenStack client API for Java.

            Screenshot

            Project Spotlight

            TurnKey TWiki Appliance

            A TWiki appliance that is easy to use and lightweight.