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: Top1007 Node: Overview2412 Node: Comparison5556 Node: Hunks8174 Node: White Space9600 Node: Blank Lines10825 Node: Case Folding11589 Node: Specified Folding12002 Node: Brief13092 Node: Binary14343 Node: Output Formats17683 Node: Sample diff Input18375 Node: Normal19868 Node: Detailed Normal20797 Node: Example Normal22522 Node: Context23245 Node: Context Format24793 Node: Detailed Context25566 Node: Example Context27122 Node: Less Context28615 Node: Unified Format29747 Node: Detailed Unified30526 Node: Example Unified31510 Node: Sections32509 Node: Specified Headings33253 Node: C Function Headings34800 Node: Alternate Names35619 Node: Side by Side36516 Node: Side by Side Format38656 Node: Example Side by Side39553 Node: Scripts40880 Node: ed Scripts41278 Node: Detailed ed42473 Node: Example ed44214 Node: Forward ed44652 Node: RCS45414 Node: If-then-else46624 Node: Line Group Formats48281 Node: Line Formats53963 Node: Detailed If-then-else57225 Node: Example If-then-else59126 Node: Comparing Directories60178 Node: Adjusting Output63293 Node: Tabs63712 Node: Pagination65234 Node: diff Performance65653 Node: Comparing Three Files67599 Node: Sample diff3 Input68460 Node: Detailed diff3 Normal69409 Node: diff3 Hunks71189 Node: Example diff3 Normal72475 Node: diff3 Merging73499 Node: Which Changes75709 Node: Marking Conflicts77115 Node: Bypassing ed79572 Node: Merging Incomplete Lines80927 Node: Saving the Changed File81644 Node: Interactive Merging82254 Node: sdiff Option Summary82952 Node: Merge Commands84052 Node: Merging with patch85188 Node: patch Input87295 Node: Imperfect87958 Node: Changed White Space88695 Node: Reversed Patches89446 Node: Inexact91031 Node: Empty Files94385 Node: Multiple Patches94949 Node: patch Messages96261 Node: Making Patches98082 Node: Invoking cmp101380 Node: cmp Options101984 Node: Invoking diff103414 Node: diff Options104880 Node: Invoking diff3115476 Node: diff3 Options116107 Node: Invoking patch119709 Node: patch Directories121649 Node: Backups123464 Node: Rejects126011 Node: patch Options126561 Node: Invoking sdiff131418 Node: sdiff Options132528 Node: Incomplete Lines135845 Node: Projects137468 Node: Shortcomings138162 Node: Changing Structure139157 Node: Special Files140105 Node: Unusual File Names141051 Node: Arbitrary Limits141673 Node: Large Files142102 Node: Ignoring Changes142974 Node: Bugs143518 Node: Concept Index144163 End Tag Table