This is Info file diff.info, produced by Makeinfo-1.55 from the input file ./diff.texi. This file documents the the GNU `diff', `diff3', `sdiff', and `cmp' commands for showing the differences between text files and the `patch' command for using their output to update files. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. Indirect: diff.info-1: 1007 diff.info-2: 48281 diff.info-3: 98082 diff.info-4: 144163 Tag Table: (Indirect) Node: Top Node: Overview Node: Comparison Node: Hunks Node: White Space Node: Blank Lines 10825 Node: Case Folding 11589 Node: Specified Folding 12002 Node: Brief 13092 Node: Binary 14343 Node: Output Formats 17683 Node: Sample diff Input 18375 Node: Normal 19868 Node: Detailed Normal 20797 Node: Example Normal 22522 Node: Context 23245 Node: Context Format 24793 Node: Detailed Context 25566 Node: Example Context 27122 Node: Less Context 28615 Node: Unified Format 29747 Node: Detailed Unified 30526 Node: Example Unified 31510 Node: Sections 32509 Node: Specified Headings 33253 Node: C Function Headings 34800 Node: Alternate Names 35619 Node: Side by Side 36516 Node: Side by Side Format 38656 Node: Example Side by Side 39553 Node: Scripts 40880 Node: ed Scripts 41278 Node: Detailed ed 42473 Node: Example ed 44214 Node: Forward ed 44652 Node: RCS 45414 Node: If-then-else 46624 Node: Line Group Formats 48281 Node: Line Formats 53963 Node: Detailed If-then-else 57225 Node: Example If-then-else 59126 Node: Comparing Directories 60178 Node: Adjusting Output 63293 Node: Tabs 63712 Node: Pagination 65234 Node: diff Performance 65653 Node: Comparing Three Files 67599 Node: Sample diff3 Input 68460 Node: Detailed diff3 Normal 69409 Node: diff3 Hunks 71189 Node: Example diff3 Normal 72475 Node: diff3 Merging 73499 Node: Which Changes 75709 Node: Marking Conflicts 77115 Node: Bypassing ed 79572 Node: Merging Incomplete Lines 80927 Node: Saving the Changed File 81644 Node: Interactive Merging 82254 Node: sdiff Option Summary 82952 Node: Merge Commands 84052 Node: Merging with patch 85188 Node: patch Input 87295 Node: Imperfect 87958 Node: Changed White Space 88695 Node: Reversed Patches 89446 Node: Inexact 91031 Node: Empty Files 94385 Node: Multiple Patches 94949 Node: patch Messages 96261 Node: Making Patches 98082 Node: Invoking cmp 101380 Node: cmp Options 101984 Node: Invoking diff 103414 Node: diff Options 104880 Node: Invoking diff3 115476 Node: diff3 Options 116107 Node: Invoking patch 119709 Node: patch Directories 121649 Node: Backups 123464 Node: Rejects 126011 Node: patch Options 126561 Node: Invoking sdiff 131418 Node: sdiff Options 132528 Node: Incomplete Lines 135845 Node: Projects 137468 Node: Shortcomings 138162 Node: Changing Structure 139157 Node: Special Files 140105 Node: Unusual File Names 141051 Node: Arbitrary Limits 141673 Node: Large Files 142102 Node: Ignoring Changes 142974 Node: Bugs 143518 Node: Concept Index 144163 End Tag Table