1This is Info file diff.info, produced by Makeinfo-1.55 from the input 2file ./diff.texi. 3 4 This file documents the the GNU `diff', `diff3', `sdiff', and `cmp' 5commands for showing the differences between text files and the `patch' 6command for using their output to update files. 7 8 Copyright (C) 1992, 1993 Free Software Foundation, Inc. 9 10 Permission is granted to make and distribute verbatim copies of this 11manual provided the copyright notice and this permission notice are 12preserved on all copies. 13 14 Permission is granted to copy and distribute modified versions of 15this manual under the conditions for verbatim copying, provided that 16the entire resulting derived work is distributed under the terms of a 17permission notice identical to this one. 18 19 Permission is granted to copy and distribute translations of this 20manual into another language, under the above conditions for modified 21versions, except that this permission notice may be stated in a 22translation approved by the Foundation. 23 24 25Indirect: 26diff.info-1: 1001 27diff.info-2: 47362 28diff.info-3: 97163 29diff.info-4: 143154 30 31Tag Table: 32(Indirect) 33Node: Top1001 34Node: Overview2406 35Node: Comparison5550 36Node: Hunks8168 37Node: White Space9594 38Node: Blank Lines10810 39Node: Case Folding11574 40Node: Specified Folding11987 41Node: Brief13077 42Node: Binary14328 43Node: Output Formats16839 44Node: Sample diff Input17531 45Node: Normal19024 46Node: Detailed Normal19953 47Node: Example Normal21678 48Node: Context22401 49Node: Context Format23949 50Node: Detailed Context24722 51Node: Example Context26278 52Node: Less Context27771 53Node: Unified Format28903 54Node: Detailed Unified29682 55Node: Example Unified30666 56Node: Sections31665 57Node: Specified Headings32409 58Node: C Function Headings33956 59Node: Alternate Names34700 60Node: Side by Side35597 61Node: Side by Side Format37737 62Node: Example Side by Side38634 63Node: Scripts39961 64Node: ed Scripts40359 65Node: Detailed ed41554 66Node: Example ed43295 67Node: Forward ed43733 68Node: RCS44495 69Node: If-then-else45705 70Node: Line Group Formats47362 71Node: Line Formats53044 72Node: Detailed If-then-else56306 73Node: Example If-then-else58207 74Node: Comparing Directories59259 75Node: Adjusting Output62374 76Node: Tabs62793 77Node: Pagination64315 78Node: diff Performance64734 79Node: Comparing Three Files66680 80Node: Sample diff3 Input67541 81Node: Detailed diff3 Normal68490 82Node: diff3 Hunks70270 83Node: Example diff3 Normal71556 84Node: diff3 Merging72580 85Node: Which Changes74790 86Node: Marking Conflicts76196 87Node: Bypassing ed78653 88Node: Merging Incomplete Lines80008 89Node: Saving the Changed File80725 90Node: Interactive Merging81335 91Node: sdiff Option Summary82033 92Node: Merge Commands83133 93Node: Merging with patch84269 94Node: patch Input86376 95Node: Imperfect87039 96Node: Changed White Space87776 97Node: Reversed Patches88527 98Node: Inexact90112 99Node: Empty Files93466 100Node: Multiple Patches94030 101Node: patch Messages95342 102Node: Making Patches97163 103Node: Invoking cmp100461 104Node: cmp Options101065 105Node: Invoking diff102495 106Node: diff Options103961 107Node: Invoking diff3114494 108Node: diff3 Options115125 109Node: Invoking patch118727 110Node: patch Directories120661 111Node: Backups122455 112Node: Rejects125002 113Node: patch Options125552 114Node: Invoking sdiff130409 115Node: sdiff Options131519 116Node: Incomplete Lines134836 117Node: Projects136459 118Node: Shortcomings137153 119Node: Changing Structure138148 120Node: Special Files139096 121Node: Unusual File Names140042 122Node: Arbitrary Limits140664 123Node: Large Files141093 124Node: Ignoring Changes141965 125Node: Bugs142509 126Node: Concept Index143154 127 128End Tag Table 129