Penguin
Recent Changes
Annotated edit history of sdiff(1) version 1, including all changes. View license author blame.
Rev Author # Line
1 perry 1 SDIFF
2 !!!SDIFF
3 NAME
4 SYNOPSIS
5 DESCRIPTION
6 SEE ALSO
7 DIAGNOSTICS
8 ----
9 !!NAME
10
11
12 sdiff - find differences between two files and merge interactively
13 !!SYNOPSIS
14
15
16 __sdiff -o__ outfile [[options] from-file
17 to-file
18 !!DESCRIPTION
19
20
21 The ''sdiff'' command merges two files and interactively
22 outputs the results to ''outfile''.
23
24
25 If ''from-file'' is a directory and ''to-file'' is
26 not, ''sdiff'' compares the file in ''from-file''
27 whose file name is that of ''to-file'', and vice versa.
28 ''from-file'' and ''to-file'' may not both be
29 directories.
30
31
32 ''sdiff'' options begin with __-__, so normally
33 ''from-file'' and ''to-file'' may not begin with
34 __-__. However, __--__ as an argument by itself treats
35 the remaining arguments as file names even if they begin
36 with __-__. You may not use __-__ as an input
37 file.
38
39
40 ''sdiff'' without __-o__ (or __--output__) produces
41 a side-by-side difference. This usage is obsolete; use
42 __diff --side-by-side__ instead.
43
44
45 __Options__
46
47
48 Below is a summary of all of the options that GNU
49 ''sdiff'' accepts. Each option has two equivalent names,
50 one of which is a single letter preceded by __-__, and
51 the other of which is a long name preceded by __--__.
52 Multiple single letter options (unless they take an
53 argument) can be combined into a single command line
54 argument. Long named options can be abbreviated to any
55 unique prefix of their name.
56
57
58 __-a__
59
60
61 Treat all files as text and compare them line-by-line, even
62 if they do not appear to be text.
63
64
65 __-b__
66
67
68 Ignore changes in amount of white space.
69
70
71 __-B__
72
73
74 Ignore changes that just insert or delete blank
75 lines.
76
77
78 __-d__
79
80
81 Change the algorithm to perhaps find a smaller set of
82 changes. This makes ''sdiff'' slower (sometimes much
83 slower).
84
85
86 __-H__
87
88
89 Use heuristics to speed handling of large files that have
90 numerous scattered small changes.
91
92
93 __--expand-tabs__
94
95
96 Expand tabs to spaces in the output, to preserve the
97 alignment of tabs in the input files.
98
99
100 __-i__
101
102
103 Ignore changes in case; consider upper- and lower-case to be
104 the same.
105
106
107 __-I__ ''regexp''
108
109
110 Ignore changes that just insert or delete lines that match
111 ''regexp''.
112
113
114 __--ignore-all-space__
115
116
117 Ignore white space when comparing lines.
118
119
120 __--ignore-blank-lines__
121
122
123 Ignore changes that just insert or delete blank
124 lines.
125
126
127 __--ignore-case__
128
129
130 Ignore changes in case; consider upper- and lower-case to be
131 the same.
132
133
134 __--ignore-matching-lines=__''regexp''
135
136
137 Ignore changes that just insert or delete lines that match
138 ''regexp''.
139
140
141 __--ignore-space-change__
142
143
144 Ignore changes in amount of white space.
145
146
147 __-l__
148
149
150 __--left-column__
151
152
153 Print only the left column of two common lines.
154
155
156 __--minimal__
157
158
159 Change the algorithm to perhaps find a smaller set of
160 changes. This makes ''sdiff'' slower (sometimes much
161 slower).
162
163
164 __-o__ ''file''
165
166
167 __--output=__''file''
168
169
170 Put merged output into ''file''. This option is required
171 for merging.
172
173
174 __-s__
175
176
177 __--suppress-common-lines__
178
179
180 Do not print common lines.
181
182
183 __--speed-large-files__
184
185
186 Use heuristics to speed handling of large files that have
187 numerous scattered small changes.
188
189
190 __-t__
191
192
193 Expand tabs to spaces in the output, to preserve the
194 alignment of tabs in the input files.
195
196
197 __--text__
198
199
200 Treat all files as text and compare them line-by-line, even
201 if they do not appear to be text.
202
203
204 __-v__
205
206
207 __--version__
208
209
210 Output the version number of ''sdiff''.
211
212
213 __-w__ ''columns''
214
215
216 __--width=__''columns''
217
218
219 Use an output width of ''columns''. Note that for
220 historical reasons, this option is __-W__ in ''diff'',
221 __-w__ in ''sdiff''.
222
223
224 __-W__
225
226
227 Ignore horizontal white space when comparing lines. Note
228 that for historical reasons, this option is __-w__ in
229 ''diff'', __-W__ in ''sdiff''.
230 !!SEE ALSO
231
232
233 cmp(1), comm(1), diff(1), diff3(1).
234 !!DIAGNOSTICS
235
236
237 An exit status of 0 means no differences were found, 1 means
238 some differences were found, and 2 means
239 trouble.
240 ----
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.