| Index Entry | Section |
|---|
|
| ! | | |
|---|
| `!' output format | 2.3 Showing Differences in Their Context |
|
| + | | |
|---|
| `+-' output format | 2.3.2 Unified Format |
|
| < | | |
|---|
| `<' output format | 2.2 Showing Differences Without Context |
| `<<<<<<<' for marking conflicts | 8.2 Marking Conflicts |
|
| _ | | |
|---|
| _POSIX2_VERSION | 17. Standards conformance |
|
| A | | |
|---|
| aligning tab stops | 5.1 Preserving Tab Stop Alignment |
| alternate file names | 2.3.4 Showing Alternate File Names |
|
| B | | |
|---|
| backup file names | 10.9 Backup File Names |
| backup file strategy | 10.8 Backup Files |
| binary file diff | 1.7 Binary Files and Forcing Text Comparisons |
| blank and tab difference suppression | 1.2 Suppressing Differences in Blank and Tab Spacing |
| blank line difference suppression | 1.3 Suppressing Differences in Blank Lines |
| brief difference reports | 1.6 Summarizing Which Files Differ |
| bug reports | 18.2 Reporting Bugs |
|
| C | | |
|---|
| C function headings | 2.3.3.2 Showing C Function Headings |
| C if-then-else output format | 2.6 Merging Files with If-then-else |
| case difference suppression | 1.4 Suppressing Case Differences |
| ClearCase | 10.2 Revision Control |
| cmp invocation | 12. Invoking cmp |
| cmp options | 12.1 Options to cmp |
| columnar output | 2.4 Showing Differences Side by Side |
| common mistakes with patches | 11.3 Avoiding Common Mistakes |
| comparing three files | 7. Comparing Three Files |
| conflict | 8. Merging From a Common Ancestor |
| conflict marking | 8.2 Marking Conflicts |
| context output format | 2.3 Showing Differences in Their Context |
| creating files | 10.4 Creating and Removing Files |
|
| D | | |
|---|
| diagnostics from patch | 10.11 Messages and Questions from patch |
| diff invocation | 13. Invoking diff |
| diff merging | 9. Interactive Merging with sdiff |
| diff options | 13.1 Options to diff |
| diff sample input | 2.1 Two Sample Input Files |
| diff3 hunks | 7.3 diff3 Hunks |
| diff3 invocation | 14. Invoking diff3 |
| diff3 options | 14.1 Options to diff3 |
| diff3 sample input | 7.1 A Third Sample Input File |
| directories and patch | 10.7 Applying Patches in Other Directories |
| directory structure changes | 18.1.2 Handling Changes to the Directory Structure |
| dry runs for patch | 10.3.4 Predicting what patch will do |
|
| E | | |
|---|
| ed script output format | 2.5.1 ed Scripts |
| EDITOR | 9.2 Merge Commands |
| empty files, removing | 10.4 Creating and Removing Files |
| exabyte, definition of | 12.1 Options to cmp |
| exbibyte, definition of | 12.1 Options to cmp |
|
| F | | |
|---|
| FDL, GNU Free Documentation License | A.1 GNU Free Documentation License |
| file name alternates | 2.3.4 Showing Alternate File Names |
| file names with unusual characters | 18.1.4 File Names that Contain Unusual Characters |
| format of diff output | 2. diff Output Formats |
| format of diff3 output | 7. Comparing Three Files |
| formats for if-then-else line groups | 2.6.1 Line Group Formats |
| forward ed script output format | 2.5.2 Forward ed Scripts |
| full lines | 3. Incomplete Lines |
| function headings, C | 2.3.3.2 Showing C Function Headings |
| fuzz factor when patching | 10.3.3 Helping patch Find Inexact Matches |
|
| G | | |
|---|
| gibibyte, definition of | 12.1 Options to cmp |
| gigabyte, definition of | 12.1 Options to cmp |
|
| H | | |
|---|
| headings | 2.3.3 Showing Which Sections Differences Are in |
| hunks | 1.1 Hunks |
| hunks for diff3 | 7.3 diff3 Hunks |
|
| I | | |
|---|
| if-then-else output format | 2.6 Merging Files with If-then-else |
| ifdef output format | 2.6 Merging Files with If-then-else |
| imperfect patch application | 10.3 Applying Imperfect Patches |
| incomplete line merging | 8.4 How diff3 Merges Incomplete Lines |
| incomplete lines | 3. Incomplete Lines |
| inexact patches | 10.3.3 Helping patch Find Inexact Matches |
| inhibit messages from patch | 10.11.1 Controlling the Verbosity of patch |
| interactive merging | 9. Interactive Merging with sdiff |
| introduction | 1. What Comparison Means |
| intuiting file names from patches | 10.6 Multiple Patches in a File |
| invoking cmp | 12. Invoking cmp |
| invoking diff | 13. Invoking diff |
| invoking diff3 | 14. Invoking diff3 |
| invoking patch | 15. Invoking patch |
| invoking sdiff | 16. Invoking sdiff |
|
| K | | |
|---|
| keyboard input to patch | 10.11.2 Inhibiting Keyboard Input |
| kibibyte, definition of | 12.1 Options to cmp |
| kilobyte, definition of | 12.1 Options to cmp |
|
| L | | |
|---|
| LC_COLLATE | 4. Comparing Directories |
| LC_NUMERIC | 2.6.1 Line Group Formats |
| LC_TIME | 2.3.1.1 Detailed Description of Context Format |
| line formats | 2.6.2 Line Formats |
| line group formats | 2.6.1 Line Group Formats |
|
| M | | |
|---|
| mebibyte, definition of | 12.1 Options to cmp |
| megabyte, definition of | 12.1 Options to cmp |
| merge commands | 9.2 Merge Commands |
| merged diff3 format | 8.3 Generating the Merged Output Directly |
| merged output format | 2.6 Merging Files with If-then-else |
| merging from a common ancestor | 8. Merging From a Common Ancestor |
| merging interactively | 9.2 Merge Commands |
| messages from patch | 10.11 Messages and Questions from patch |
| multibyte characters | 18.1.1 Handling Multibyte and Varying-Width Characters |
| multiple patches | 10.6 Multiple Patches in a File |
|
| N | | |
|---|
| newline treatment by diff | 3. Incomplete Lines |
| normal output format | 2.2 Showing Differences Without Context |
|
| O | | |
|---|
| options for cmp | 12.1 Options to cmp |
| options for diff | 13.1 Options to diff |
| options for diff3 | 14.1 Options to diff3 |
| options for patch | 15.1 Options to patch |
| options for sdiff | 16.1 Options to sdiff |
| output formats | 2. diff Output Formats |
| overlap | 8. Merging From a Common Ancestor |
| overlapping change, selection of | 8.1 Selecting Which Changes to Incorporate |
| overview of diff and patch | Overview |
|