[ < ] | [ > ] | [ << ] | [ Up ] | [ >> ] | [Top] | [Contents] | [Index] | [ ? ] |
2. diff
Output Formats
diff
has several mutually exclusive options for output format.
The following sections describe each format, illustrating how
diff
reports the differences between two sample input files.
2.1 Two Sample Input Files | Sample diff input files for examples.
| |
2.2 Showing Differences Without Context | Showing differences without surrounding text. | |
2.3 Showing Differences in Their Context | Showing differences with the surrounding text. | |
2.4 Showing Differences Side by Side | Showing differences in two columns. | |
2.5 Making Edit Scripts | Generating scripts for other programs. | |
2.6 Merging Files with If-then-else | Merging files with if-then-else. |