xxdiff

A free and open source graphical file and directories comparison and merge tool
Download

xxdiff Ranking & Summary

Advertisement

  • Rating:
  • License:
  • GPL
  • Price:
  • FREE
  • Publisher Name:
  • Martin Blais
  • Publisher web site:
  • http://furius.ca/home/software.html
  • Operating Systems:
  • Mac OS X 10.3.9 or later
  • File Size:
  • 6.5 MB

xxdiff Tags


xxdiff Description

A free and open source graphical file and directories comparison and merge tool xxdiff is an open source graphical browser for viewing the differences between two or three files, or between two directories, and can be used to easily produce a merged version. xxdiff is an essential software development tool that can be used to:· visualize the differences between files or directories;· merge files with differences, resolving conflicts and saving output to a new file or patch;· assist file changes reviewing and comment production (e.g. approving source code changes before they get merged into a source tree). xxdiff doesn't itself compute the differences between files, it just displays them graphically (the rationale behind this is that you can use different tools to compute the actual diffs (for example using Rational ClearCase's cleardiff, which gives more sensible results than GNU diff in certain cases), there is a relatively standard format for difference output (POSIX diff), so it is easy and efficient to parse diff output from different programs, under the UNIX dataflow paradigm, it is common for graphical tools to be built on top of text tools. There are already many good tools to perform diffs, so there's no need to rewrite them.NOTE: xxdiff does not support comparing files encoded with Unicode. Also, it does not support inline editing of the diffed files. If you need these features, you could try emacs or Meld (although both of these lack some of the most interesting features of xxdiff). Here are some key features of "xxdiff": · Comparing two files, three files, or two directories (shallow and recursive); · Horizontal diffs highlighting; · Files can be merged interactively and resulting output visualized and saved; · Has features to assist in performing merge reviews/policing; · Can unmerge CVS conflicts in automatically merged file and display them as two files, to help resolve conflicts; · Uses external diff program to compute differences: works with GNU diff, SGI diff and ClearCase's cleardiff, and any other diff whose output is similar to those; · Fully customizable with a resource file; · Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work equally well with KDE or Gnome); · Features and output that ease integration with scripts. What's New in This Release: · Implemented a Python package that contains much code to support writing scripts around xxdiff. All the xxdiff-* scripts have been integrated in this Python package and renamed for convenience. New features: a warning is now issued in decision when accepting or rejecting, if incompatible selections have been made. The build system was converted from tmake to qmake. Fixed a few minor bugs.


xxdiff Related Software