Diffuse Merge Tool icon
Diffuse Merge Tool icon

Diffuse Merge Tool

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.

Diffuse Merge Tool screenshot 1

Cost / License

  • Free
  • Open Source

Platforms

  • Linux  [https://flathub.org/apps/details/io.github.mightycreak.Diffuse](https://flathub.org/apps/details/io.github.mightycreak.Diffuse)
-
No reviews
22likes
4comments
0news articles

Features

Suggest and vote on features

Properties

  1.  Lightweight

Features

  1.  3 way merge
  2.  Side-by-Side Comparison
  3.  Fast file and folder search
  4.  File Comparison
  5.  Compare Text

 Tags

  • development-xfce

Diffuse Merge Tool News & Activities

Highlights All activities

Recent activities

Show all activities

Comments and Reviews

   
 Post comment/review
Top Positive Comment
hced
0

Best I've tried so far. The n-way diffing is insanely useful, letting you diff any amount of files simultaneously. Albeit ... I was too quick to type. It seems to currently lack Word Wrap, which is a key feature for me. Given how good it seems otherwise, I won't knock down more than one star. Hoping Word Wrap gets implemented.

Top Negative Comment
dandv
1

Diffuse is the fastest Linux-based visual diff tool listed here on AlternativeTo, but it lacks some critical features:

  1. You can't display the files on top of each other. Files are always shown side-by-side.
  2. There's no word wrapping for long lines.
  3. There's no way to see the differences in lines longer than the window width. Combined with 1. and 2. above, this makes the tool impossible to use for files with long lines (e.g. CSVs).
  4. You can't customize the keyboard shortcuts.
  5. There's no special display for moved lines. Meld's display is much nicer - it shows a bubble starting from the source line and ending on the destination line: Meld moved line bubble

[Edited by dandv, June 28]

dandv
1

The only native Linux tool I've found to diff in under one second two CSV files that only differ in the date format. See https://sourceforge.net/p/kdiff3/bugs/217/ for details.

thdox
2

Diffuse is the only open source linux application that enables manual alignment. kdiff3 has the functionality, but it is less ergonomic.

gcb

what do you call manual alignment? in linux i use vimdiff or meld. i'm starting to use diffuse when i'm in windows and missing meld.

thdox

On a long text file, with redundant text, the tool is lost. Diffuse enables you to tell that line 123 of file 1 must be aligned with line 153 of file 2, and then relaunch the comparison

What is Diffuse Merge Tool?

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.

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.

Official Links

Diffuse Merge Tool information

  • Developed by

    Derrick Moser, Henri Menke
  • Licensing

    Open Source (GPL-2.0) and Free product.
  • Written in

  • Alternatives

    56 alternatives listed
  • Supported Languages

    • English

AlternativeTo Categories

DevelopmentFile Management

GitHub repository

  •  314 Stars
  •  49 Forks
  •  44 Open Issues
  •   Updated  
View on GitHub

Our users have written 4 comments and reviews about Diffuse Merge Tool, and it has gotten 22 likes

Diffuse Merge Tool was added to AlternativeTo by 10litrov on and this page was last updated .