Skip to content

Files

Latest commit

b463318 · Jan 5, 2023

History

History

Talk

Folders and files

NameName
Last commit message
Last commit date

parent directory

..
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
- show termcap
- show termcap-blue

diff		C
diff --color	C
colordiff

vimdiff		C
git diff	C

    git -c color.diff.new='bold reverse green' \
        -c color.diff.old='bold reverse red'   \
        diff --no-index -U0 --no-color \
	     --word-diff=color --word-diff-regex=. \
	    <file1> <file2>

xdiff		Python, PHP, .......

mgdiff		C X11
diffuse		Python
bcompare	C X11	Free?
kompare		C X11	KDE
xxdiff		C X11
meld		Python
kdiff3		C X11	Qt
tkdiff		Tcl/Tk

    # To be checked ...
    araxis - Windows, should work under wine
    bc
    bc3
    codecompare
    deltawalker
    diff-so-fancy - https://github.com/so-fancy/diff-so-fancy
    diffmerge
    ecmerge
    emerge
    examdiff
    guiffy
    gvimdiff
    gvimdiff2
    gvimdiff3
    klondiff - https://github.com/pierstitus/klondiff (python)
    opendiff
    p4merge
    vimdiff2
    vimdiff3
    winmerge

ccdiff		Perl

ccdiff termcap termcap-blue

xterm -bg gray10 -fg gray90 &

# Colors (on two xterms: one normal and one with bg black)
ccdiff -r                    term*
ccdiff    --pink             term*
ccdiff -r --pink             term*
ccdiff    --no-color         term*
ccdiff    --no-color --fancy term*
ccdiff -r --no-color --fancy term*
ccdiff -r --old=blue         term*
ccdiff -r --new=blue         term*
ccdiff    --bg=black         term*

ccdiff -u                    term*
ccdiff -u0                   term*

- show member.csv
- show export.csv

ccdiff    member.csv export.csv
ccdiff -r member.csv export.csv
ccdiff -r member.csv export.csv -w
ccdiff -r member.csv export.csv    -i
ccdiff -r member.csv export.csv -w -i

ccdiff -r                    term*
ccdiff -r -B                 term*

cd3 hexchat-git
git show 5c5a

git config --global diff.tool ccdiff
git config --global difftool.prompt false
git config --global difftool.ccdiff.cmd 'ccdiff --utf-8 -u -r $LOCAL $REMOTE'
git difftool 5c5a~..5c5a
cat ~/bin/git-ccdiff
git ccdiff 5c5a
cat 5c5a.uchar

290 modules on CPAN with Diff
Some depend on Text::Diff
Many depend (indirectly) on Algorithm::Diff

man Algorithm::Diff

show ccdiff1
show ccdiff

show m0
show e0

explain horizontal to vertical again

Text::Diff integration. Neil?
Ignore whitespace options:
  -Z, --ignore-trailing-space	ignore white space at line end
  -b, --ignore-space-change	ignore changes in the amount of white space
  -w, --ignore-all-space	ignore all white space
  -E, --ignore-tab-expansion	ignore changes due to tab expansion

Future?
  -B, --ignore-blank-lines	ignore changes where lines are all blank