sdiff
E299206
sdiff is a command-line utility that displays two files side by side and highlights their differences, allowing interactive merging of changes.
All labels observed (1)
| Label | Occurrences |
|---|---|
| sdiff canonical | 1 |
Statements (48)
| Predicate | Object |
|---|---|
| instanceOf |
Unix command
ⓘ
command-line utility ⓘ file comparison tool ⓘ |
| changeMarker |
"<" for lines only in the left file
ⓘ
">" for lines only in the right file ⓘ "|" for differing lines ⓘ |
| distribution | most Unix-like system distributions ⓘ |
| documentation | sdiff(1) man page ⓘ |
| input | two file paths ⓘ |
| invokedFrom | shell ⓘ |
| license | GNU General Public License ⓘ |
| maintainedBy | Free Software Foundation ⓘ |
| option |
--strip-trailing-cr (strip carriage return at end of input lines)
ⓘ
-B (ignore changes whose lines are all blank) ⓘ -E (ignore changes due to tab expansion) ⓘ -Z (ignore trailing white space) ⓘ -b (ignore changes in the amount of white space) ⓘ -i (ignore case differences in lines) ⓘ -l (left-column mode in some implementations) ⓘ -o FILE (write merged output to FILE) ⓘ -s (suppress common lines) ⓘ -t (expand tabs to spaces in output) ⓘ -w N (set output width to N characters) ⓘ |
| output |
merge result written to a file or standard output
ⓘ
side-by-side comparison of the two files ⓘ |
| outputFormat | two columns separated by a gutter with change markers ⓘ |
| partOf |
GNU Diffutils
ⓘ
surface form:
GNU diffutils
|
| primaryFunction | display differences between two files side by side ⓘ |
| relatedTo |
cmp
ⓘ
colordiff ⓘ diff ⓘ wdiff ⓘ |
| runsOn |
Linux
ⓘ
Unix-like operating systems ⓘ macOS ⓘ |
| supportsFeature |
ignoring case differences
ⓘ
ignoring whitespace differences ⓘ interactive merging of changes ⓘ side-by-side diff output ⓘ suppressing common lines ⓘ treating files as binary ⓘ treating files as text ⓘ |
| typicalInvocation | sdiff [OPTION]... FILE1 FILE2 ⓘ |
| useCase |
assisting manual three-way merges when combined with other tools
ⓘ
merging changes from two versions of a text file ⓘ reviewing differences between configuration files ⓘ |
| userInteraction | prompts user to choose which version of differing lines to keep ⓘ |
| usesProgram | diff ⓘ |
Referenced by (1)
Full triples — surface form annotated when it differs from this entity's canonical label.