xxdiff

graphical file/directory comparison and merge tool
  https://furius.ca/xxdiff/
  -2
  3 reviews



Xxdiff is a powerful tool for viewing the differences between two or three files, or two directories, and can be used to produce a merged version. The texts of the two or three files are presented side by side with their differences highlighted with colors for easy identification. Among its features are:

* Compares two or three files, or two directories (shallow and recursive) * Horizontal highlighting of diffs * Interactive merges, previewing and saving of the resulting output * Unmerges CVS conflicts and displays two files, to help resolve conflicts * Fully customizable with a resource file * Features and output that ease integration with scripts

The scripts that accompany xxdiff can be found in the xxdiff-scripts package.
Latest reviews
1
EdmundF 6 years ago

Installed and nowhere to be found , great stuff

4
tedr56 12 years ago

I wasn't aware of this type of programs. But since I get it, quite quick and simple to merge my git codes with "git difftool" or "git mergetool"

2
opticyclic 13 years ago

Command line invocation only, although does display the results graphically. Doesn't look quite right. Use Meld, Diffuse or KDiff3 instead.