2 .\" $OpenBSD: sdiff.1,v 1.15 2007/06/29 14:48:07 jmc Exp $
4 .\" Written by Raymond Lai <ray@cyth.net>.
23 displays two files side by side,
24 with any differences between the two highlighted as follows:
25 new lines are marked with
27 deleted lines are marked with
29 and changed lines are marked with
33 can also be used to interactively merge two files,
34 prompting at each set of differences.
37 option for an explanation.
42 Only print the left column for identical lines.
43 .It Fl o -output Ar outfile
50 In this mode, the user is prompted for each set of differences.
56 for details of which editor, if any, is invoked.
58 The commands are as follows:
61 Choose left set of diffs.
63 Choose right set of diffs.
65 Silent mode \(en identical lines are not printed.
67 Verbose mode \(en identical lines are printed.
69 Start editing an empty file, which will be merged into
71 upon exiting the editor.
73 Start editing file with left set of diffs.
75 Start editing file with right set of diffs.
77 Start editing file with both sets of diffs.
82 .It Fl s -suppress-common-lines
84 .It Fl w -width Ar width
87 characters on each line.
88 The default is 130 characters.
101 .It Fl b -ignore-space-change
102 Ignore trailing blank spaces.
105 .It Fl I -ignore-matching-lines Ar regexp
106 Ignore line changes matching
108 All lines in the change must match
110 for the change to be ignored.
111 .It Fl i -ignore-case
112 Do a case-insensitive comparison.
113 .It Fl t -expand-tabs
114 Expand tabs to spaces.
115 .It Fl W -ignore-all-space
117 .It Fl B -ignore-blank-lines
119 .It Fl E -ignore-tab-expansion
120 Treat tabs and eight spaces as the same.
121 .It Fl t -ignore-tabs
123 .It Fl H -speed-large-files
124 Assume scattered small changes in a large file.
125 .It Fl -ignore-file-name-case
126 Ignore the case of file names.
127 .It Fl -no-ignore-file-name-case
128 Do not ignore file name case.
129 .It Fl -strip-trailing-cr
130 Skip identical lines.
131 .It Fl -tabsize Ar NUM
132 Change the size of tabs (default is 8.)
136 .It Ev EDITOR , VISUAL
137 Specifies an editor to use with the
155 Specifies a directory for temporary files to be created.
167 was written from scratch for the public domain by
168 .An Ray Lai Aq ray@cyth.net .
170 Tabs are treated as anywhere from one to eight characters wide,
171 depending on the current column.
172 Terminals that treat tabs as eight characters wide will look best.