-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy pathREADME
115 lines (92 loc) · 2.46 KB
/
README
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
- 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