SDIFF(1) | General Commands Manual | SDIFF(1) |
sdiff
—
side-by-side diff
sdiff |
[-abdilstW ] [-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
-o
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
-w
widthOptions passed to diff(1) are:
-a
-b
-d
-I
regexp-i
-t
-W
-w
flag is passed to
diff(1)).The sdiff
utility exits with one of the
following values:
sdiff
has been available since
OpenBSD 3.9.
sdiff
was written from scratch for the
public domain by Ray Lai
<ray@cyth.net>.
Although undocumented, sdiff
supports most
long options supported by GNU sdiff, though some require GNU diff.
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.
sdiff
may not work with binary data.
October 17, 2017 | OpenBSD-current |