Graphical Diff Programs for Linux

Does any GUI diff tool for Linux provides familiar to GitHub layout of differences?

If you call :

git difftool -d

to invoke your graphical diff viewer, it will open in a "directory diff" mode.

meld for example presents you with an overview of all different files, and you can view the differences for each individual file by double clicking.

Visual SVN diff and compare tools for Linux

Note: If your diff tool has a CLI (a command line interface), it can be integrated with Git quite easily, both for diff and merge (if it supports 3-way merges).

Since Git1.6.3, the difftool - mergetool options allow you to integrate that diff program (see "How do I view 'git diff' output with visual diff program?").

KDiff3 for instance is a good candidate for that, since it is even auto-detected by Git.

What's the best visual merge tool for Git?

Meld is a free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool.

Here's how to install it on:

  • Ubuntu
  • Mac
  • Windows: "The recommended version of Meld for Windows is the most recent release, available as an MSI from https://meldmerge.org"

Graphical diff for darcs

in fact you should write something like:

darcs diff --diff-command="diffuse %1 %2" myfile.txt 

It works with ECMerge (the tool I work on), it should work seamlessly with diffuse. Darcs will call diffuse with temporary files as necessary (to compare the files from the repository). By the way, ECMerge can dig in Darcs configurations with its browser UI.

EDITED:

to diff tags or patches in the repository, use --from-tag= or --from-patch= and --to-tag= or --to-patch= notation. You should be able to do what you want, however note that from-patch means "from before patch" and --to-patch means "up to after patch". it was not really obvious for me...
(to know the last of changes use darcs changes)



Related Topics



Leave a reply



Submit