./textproc/xxdiff, Graphical file comparator and merge tool

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]


Branch: CURRENT, Version: 4.0.1nb5, Package name: xxdiff-4.0.1nb5, Maintainer: pkgsrc-users

xxdiff is a graphical file and directories comparator and merge tool.

Features

* 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.

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).


Required to run:
[x11/qt4-libs]

Required to build:
[pkgtools/x11-links] [x11/qt4-tools] [x11/xcb-proto] [x11/fixesproto4] [pkgtools/cwrappers] [x11/xorgproto]

Master sites:

Filesize: 1935.419 KB

Version history: (Expand)


CVS history: (Expand)


   2021-12-08 17:07:18 by Adam Ciarcinski | Files touched by this commit (3063)
Log message:
revbump for icu and libffi
   2021-10-26 13:23:42 by Nia Alarie | Files touched by this commit (1161)
Log message:
textproc: Replace RMD160 checksums with BLAKE2s checksums

All checksums have been double-checked against existing RMD160 and
SHA512 hashes

Unfetchable distfiles (fetched conditionally?):
./textproc/convertlit/distinfo clit18src.zip
   2021-10-07 17:02:49 by Nia Alarie | Files touched by this commit (1162)
Log message:
textproc: Remove SHA1 hashes for distfiles
   2020-08-17 22:20:41 by Leonardo Taccari | Files touched by this commit (2202)
Log message:
*: revbump after fontconfig bl3 changes (libuuid removal)
   2020-03-08 17:51:54 by Thomas Klausner | Files touched by this commit (2833)
Log message:
*: recursive bump for libffi
   2020-01-18 22:51:16 by Jonathan Perkin | Files touched by this commit (1836)
Log message:
*: Recursive revision bump for openssl 1.1.1.
   2019-12-19 23:24:54 by Joerg Sonnenberger | Files touched by this commit (1)
Log message:
Uses Python 2 syntax.
   2019-11-04 22:43:49 by Roland Illig | Files touched by this commit (155)
Log message:
textproc: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.