SDIFF(1) | General Commands Manual | SDIFF(1) |
sdiff
—
side-by-side diff
sdiff |
[-abdilstHW ] [-I
regexp] [-o
outfile] [-w
width] file1
file2 |
sdiff
displays two files side by side,
with any differences between the two highlighted as follows: new lines are
marked with ‘>’; deleted lines are marked with
‘<’; and changed lines are marked with
‘|’.
sdiff
can also be used to interactively
merge two files, prompting at each set of differences. See the
-o
option for an explanation.
The options are:
-l
--left-column
-o
--output
outfileEDITOR
and VISUAL
, below,
for details of which editor, if any, is invoked.
The commands are as follows:
l
|
1
r
|
2
s
v
e
e
l
e
r
e
b
q
sdiff
.-s
--suppress-common-lines
-w
--width
widthOptions passed to diff(1) are:
-a
--text
-b
--ignore-space-change
-d
--minimal
-I
--ignore-matching-lines
regexp-i
--ignore-case
-t
--expand-tabs
-W
--ignore-all-space
-B
--ignore-blank-lines
-E
--ignore-tab-expansion
-t
--ignore-tabs
-H
--speed-large-files
--ignore-file-name-case
--no-ignore-file-name-case
--strip-trailing-cr
--tabsize
NUM--diff-program
PROGRAMsdiff
was written from scratch for the
public domain by Ray Lai
⟨ray@cyth.net⟩.
Tabs are treated as anywhere from one to eight characters wide, depending on the current column. Terminals that treat tabs as eight characters wide will look best.
April 8, 2017 | macOS 14.6 |