This shows you the differences between two versions of the page.
|
diff [2012/05/15 01:15] |
diff [2022/04/16 12:22] (current) |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| + | @related: [[Editor]] | ||
| + | |||
| + | |||
| + | * http://en.wikipedia.org/wiki/Diff | ||
| + | * kdiff3 : https://bugs.launchpad.net/debian/+source/kdiff3/+bug/292233 http://packages.qa.debian.org/k/kdiff3.html | ||
| + | |||
| + | * http://kign.blogspot.com/2007/10/kdiff3-for-cygwin.html | ||
| + | * https://sourceforge.net/projects/kdiff3/files/ | ||
| + | |||
| + | |||
| + | ===== binary ===== | ||
| + | |||
| + | * http://www.gnu.org/software/diffutils/manual/html_node/Binary.html | ||
| + | * http://packages.qa.debian.org/b/bsdiff.html http://www.daemonology.net/bsdiff/ | ||
| + | * http://en.wikipedia.org/wiki/Jojos_Binary_Diff | ||
| + | * http://code.google.com/p/xdelta/ | ||
| + | * http://www.cjmweb.net/vbindiff/ | ||
| + | |||
| + | |||
| + | ===== misc ===== | ||
| + | |||
| + | |||
| + | http://www.amjith.blogspot.com/2007/07/visual-diff-tools-in-linux.html | ||
| + | |||
| + | |||
| + | * http://debaday.debian.net/2007/05/02/meld-graphical-tool-to-diff-and-merge-files/#comment-61276 | ||
| + | |||
| + | Meld is good, but I am looking a diff tool that works also when blocks are shuffled this mean a diff that support crossed correspondencies … | ||
| + | Am I clear enough ? | ||
| + | |||
| + | Ie : | ||
| + | |||
| + | <html> | ||
| + | |||
| + | cat ordered.txt | ||
| + | |||
| + | This | ||
| + | is part 1 | ||
| + | |||
| + | and 2d part | ||
| + | |||
| + | before | ||
| + | the 3rd | ||
| + | one | ||
| + | |||
| + | cat shuffled.txt | ||
| + | |||
| + | This | ||
| + | is part 1 | ||
| + | |||
| + | before | ||
| + | the 3rd | ||
| + | one | ||
| + | |||
| + | and 2d part | ||
| + | </html> | ||
| + | |||
| + | |||
| + | same files different line/block order | ||
| + | |||
| + | Well I bet this can be scripted | ||
| + | |||
| + | |||
| + | |||
| + | ==== tkxcd ==== | ||
| + | |||
| + | tkxcd, is a diff front end that has a look and feel similar to Atria ClearCase's xcleardiff. | ||
| + | |||
| + | |||
| + | * [[APT]] : http://rzr.online.fr/apt/ | ||
| + | * http://www.novell.com/products/linuxpackages/suselinux/tkxcd.html | ||
| + | * http://bugs.debian.org/139670 | ||
| + | * http://lists.debian.org/debian-mentors/2002/04/msg00162.html | ||
| + | |||
| + | Available at: [[Obsolete]] | ||
| + | |||
| + | * http://netsw.org/system/tools/fileutils/diff/ | ||
| + | * http://www.doitnow.com/~quillan/john/tkxcd/ | ||
| + | * http://www.public.asu.edu/~makrists/debian/tkxcd | ||
| + | * ftp://ftp.redhat.com/pub/contrib/RPMS/tkxcd-1.1.0-1.i386.rpm | ||
| + | * ftp://ftp.redhat.com/pub/contrib/SRPMS/tkxcd-1.1.0-1.src.rpm | ||
| + | |||
| + | # ed2k://|file|tkxcd_1.1.0.tar.gz|14333|bad5b17c1ab2f12044c04c3827e7ec6f| | ||
| + | |||
| + | |||
| + | ===== MORE ===== | ||
| + | |||
| + | @TaG: TexT TooL | ||
| + | |||
| + | {{https://diaspod.s3.amazonaws.com/uploads/images/scaled_full_07be26d8f3a65dc369fe.jpg}} | ||
| + | |||