1 1 Appendix C Index 1 **************** 1 1 [index ]
1 · ! output format Context. (line 6) · +- output format Unified Format. (line 6) · < output format Normal. (line 6) · <<<<<<< for marking conflicts Marking Conflicts. (line 6) · _POSIX2_VERSION Standards conformance. 1 (line 23) · ad capability diff Options. (line 179) · aligning tab stops Tabs. (line 6) · alternate file names Alternate Names. (line 6) · always color option diff Options. (line 43) · auto color option diff Options. (line 42) · backup file names Backup Names. (line 6) · backup file strategy Backups. (line 6) · binary file diff Binary. (line 6) · blank and tab difference suppression White Space. (line 6) · blank line difference suppression Blank Lines. (line 6) · brief difference reports Brief. (line 6) · bug reports Bugs. (line 6) · C function headings C Function Headings. (line 6) · C if-then-else output format If-then-else. (line 6) · case difference suppression Case Folding. (line 6) · ClearCase Revision Control. (line 6) · cmp invocation Invoking cmp. (line 6) · cmp options cmp Options. (line 6) · color, distinguishing different context diff Options. (line 37) · columnar output Side by Side. (line 6) · common mistakes with patches Avoiding Common Mistakes. 1 (line 6) · comparing three files Comparing Three Files. 1 (line 6) · conflict diff3 Merging. (line 26) · conflict marking Marking Conflicts. (line 6) · context output format Context. (line 6) · creating files Creating and Removing. 1 (line 6) · de capability diff Options. (line 184) · diagnostics from patch patch Messages. (line 6) · diff invocation Invoking diff. (line 6) · diff merging Interactive Merging. (line 6) · diff options diff Options. (line 6) · diff sample input Sample diff Input. (line 6) · diff3 hunks diff3 Hunks. (line 6) · diff3 invocation Invoking diff3. (line 6) · diff3 options diff3 Options. (line 6) · diff3 sample input Sample diff3 Input. (line 6) · directories and patch patch Directories. (line 6) · directory structure changes Changing Structure. (line 6) · dry runs for patch Dry Runs. (line 6) · ed script output format ed Scripts. (line 6) · EDITOR Merge Commands. (line 50) · empty files, removing Creating and Removing. 1 (line 6) · exabyte, definition of cmp Options. (line 99) · exbibyte, definition of cmp Options. (line 102) · file name alternates Alternate Names. (line 6) · file names with unusual characters Unusual File Names. (line 6) · format of diff output Output Formats. (line 6) · format of diff3 output Comparing Three Files. 1 (line 6) · formats for if-then-else line groups Line Group Formats. (line 6) · forward ed script output format Forward ed. (line 6) · full lines Incomplete Lines. (line 6) · function headings, C C Function Headings. (line 6) · fuzz factor when patching Inexact. (line 6) · gibibyte, definition of cmp Options. (line 87) · gigabyte, definition of cmp Options. (line 84) · hd capability diff Options. (line 189) · headings Sections. (line 6) · hunks Hunks. (line 6) · hunks for diff3 diff3 Hunks. (line 6) · if-then-else output format If-then-else. (line 6) · ifdef output format If-then-else. (line 6) · imperfect patch application Imperfect. (line 6) · incomplete line merging Merging Incomplete Lines. 1 (line 6) · incomplete lines Incomplete Lines. (line 6) · inexact patches Inexact. (line 6) · inhibit messages from patch More or Fewer Messages. 1 (line 6) · interactive merging Interactive Merging. (line 6) · introduction Comparison. (line 6) · intuiting file names from patches Multiple Patches. (line 6) · invoking cmp Invoking cmp. (line 6) · invoking diff Invoking diff. (line 6) · invoking diff3 Invoking diff3. (line 6) · invoking patch Invoking patch. (line 6) · invoking sdiff Invoking sdiff. (line 6) · keyboard input to patch patch and Keyboard Input. 1 (line 6) · kibibyte, definition of cmp Options. (line 75) · kilobyte, definition of cmp Options. (line 71) · LC_COLLATE Comparing Directories. 1 (line 6) · LC_NUMERIC Line Group Formats. (line 143) · LC_TIME Detailed Context. (line 12) · line formats Line Formats. (line 6) · line group formats Line Group Formats. (line 6) · ln capability diff Options. (line 194) · mebibyte, definition of cmp Options. (line 82) · megabyte, definition of cmp Options. (line 79) · merge commands Merge Commands. (line 6) · merged diff3 format Bypassing ed. (line 6) · merged output format If-then-else. (line 6) · merging from a common ancestor diff3 Merging. (line 6) · merging interactively Merge Commands. (line 6) · messages from patch patch Messages. (line 6) · multibyte characters Internationalization. 1 (line 6) · multiple patches Multiple Patches. (line 6) · newline treatment by diff Incomplete Lines. (line 6) · none color option diff Options. (line 40) · normal output format Normal. (line 6) · options for cmp cmp Options. (line 6) · options for diff diff Options. (line 6) · options for diff3 diff3 Options. (line 6) · options for patch patch Options. (line 6) · options for sdiff sdiff Options. (line 6) · output formats Output Formats. (line 6) · overlap diff3 Merging. (line 26) · overlapping change, selection of Which Changes. (line 6) · overview of diff and patch Overview. (line 6) · paginating diff output Pagination. (line 6) · patch consumer tips Tips for Patch Consumers. 1 (line 6) · patch input format patch Input. (line 6) · patch invocation Invoking patch. (line 6) · patch messages and questions patch Messages. (line 6) · patch options patch Options. (line 6) · patch producer tips Tips for Patch Producers. 1 (line 6) · patch, common mistakes Avoiding Common Mistakes. 1 (line 6) · patches, shrinking Generating Smaller Patches. 1 (line 6) · patching directories patch Directories. (line 6) · PATCH_GET Revision Control. (line 13) · PATCH_VERSION_CONTROL Backup Names. (line 21) · pebibyte, definition of cmp Options. (line 97) · performance of diff diff Performance. (line 6) · petabyte, definition of cmp Options. (line 94) · POSIX patch and POSIX. (line 6) · POSIX <1> Standards conformance. 1 (line 6) · POSIXLY_CORRECT patch and POSIX. (line 6) · POSIXLY_CORRECT <1> Standards conformance. 1 (line 6) · projects for directories Shortcomings. (line 6) · quoting style patch Quoting Style. (line 6) · QUOTING_STYLE patch Quoting Style. (line 26) · RCS Revision Control. (line 6) · RCS script output format RCS. (line 6) · regular expression matching headings Specified Headings. (line 6) · regular expression suppression Specified Lines. (line 6) · reject file names Reject Names. (line 6) · removing empty files Creating and Removing. 1 (line 6) · reporting bugs Bugs. (line 6) · reversed patches Reversed Patches. (line 6) · revision control Revision Control. (line 6) · sample input for diff Sample diff Input. (line 6) · sample input for diff3 Sample diff3 Input. (line 6) · SCCS Revision Control. (line 6) · script output formats Scripts. (line 6) · sdiff invocation Invoking sdiff. (line 6) · sdiff options sdiff Options. (line 6) · sdiff output format sdiff Option Summary. 1 (line 6) · section headings Sections. (line 6) · side by side Side by Side. (line 6) · side by side format Side by Side Format. (line 6) · SIMPLE_BACKUP_SUFFIX Backup Names. (line 12) · special files Special Files. (line 6) · specified headings Specified Headings. (line 6) · summarizing which files differ Brief. (line 6) · System V diff3 compatibility Saving the Changed File. 1 (line 6) · tab and blank difference suppression White Space. (line 6) · tab stop alignment Tabs. (line 6) · tebibyte, definition of cmp Options. (line 92) · terabyte, definition of cmp Options. (line 89) · terminal, using color iff diff Options. (line 42) · testing patch Dry Runs. (line 6) · text versus binary diff Binary. (line 6) · timestamp format, context diffs Detailed Context. (line 12) · timestamp format, unified diffs Detailed Unified. (line 12) · timestamps on patched files Patching Timestamps. (line 6) · traditional patch patch and Tradition. (line 6) · trailing blanks Trailing Blanks. (line 6) · two-column output Side by Side. (line 6) · unified output format Unified Format. (line 6) · unmerged change Which Changes. (line 6) · varying-width characters Internationalization. 1 (line 6) · verbose messages from patch More or Fewer Messages. 1 (line 6) · version control Revision Control. (line 6) · VERSION_CONTROL Revision Control. (line 22) · VERSION_CONTROL <1> Backup Names. (line 21) · white space in patches Changed White Space. (line 6) · yottabyte, definition of cmp Options. (line 110) · zettabyte, definition of cmp Options. (line 104) 1 1