home *** CD-ROM | disk | FTP | other *** search
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: LaTeX Document
(document/latex).
You can browse this item here: diff.info-2
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 100%
| dexvert
| LaTeX Document (document/latex)
| magic
| Supported |
| 100%
| dexvert
| GNU Info File (text/gnuInfo)
| magic
| Supported |
| 1%
| dexvert
| Text File (text/txt)
| fallback
| Supported |
| 100%
| file
| data
| default
| |
| 100%
| TrID
| GNU Info document
| default (weak)
| |
| 100%
| dexmagic
| GNU Info
| default
| |
| 100%
| perlTextCheck
| Likely Text (Perl)
| default
| |
| 100%
| siegfried
| fmt/281 LaTeX (Subdocument)
| default
| |
| 100%
| detectItEasy
| Format: plain text[LF]
| default (weak)
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 54 68 69 73 20 69 73 20 | 49 6e 66 6f 20 66 69 6c |This is |Info fil|
|00000010| 65 20 64 69 66 66 2e 69 | 6e 66 6f 2c 20 70 72 6f |e diff.i|nfo, pro|
|00000020| 64 75 63 65 64 20 62 79 | 20 4d 61 6b 65 69 6e 66 |duced by| Makeinf|
|00000030| 6f 2d 31 2e 35 35 20 66 | 72 6f 6d 20 74 68 65 20 |o-1.55 f|rom the |
|00000040| 69 6e 70 75 74 0a 66 69 | 6c 65 20 2e 2f 64 69 66 |input.fi|le ./dif|
|00000050| 66 2e 74 65 78 69 2e 0a | 0a 20 20 20 54 68 69 73 |f.texi..|. This|
|00000060| 20 66 69 6c 65 20 64 6f | 63 75 6d 65 6e 74 73 20 | file do|cuments |
|00000070| 74 68 65 20 74 68 65 20 | 47 4e 55 20 60 64 69 66 |the the |GNU `dif|
|00000080| 66 27 2c 20 60 64 69 66 | 66 33 27 2c 20 60 73 64 |f', `dif|f3', `sd|
|00000090| 69 66 66 27 2c 20 61 6e | 64 20 60 63 6d 70 27 0a |iff', an|d `cmp'.|
|000000a0| 63 6f 6d 6d 61 6e 64 73 | 20 66 6f 72 20 73 68 6f |commands| for sho|
|000000b0| 77 69 6e 67 20 74 68 65 | 20 64 69 66 66 65 72 65 |wing the| differe|
|000000c0| 6e 63 65 73 20 62 65 74 | 77 65 65 6e 20 74 65 78 |nces bet|ween tex|
|000000d0| 74 20 66 69 6c 65 73 20 | 61 6e 64 20 74 68 65 20 |t files |and the |
|000000e0| 60 70 61 74 63 68 27 0a | 63 6f 6d 6d 61 6e 64 20 |`patch'.|command |
|000000f0| 66 6f 72 20 75 73 69 6e | 67 20 74 68 65 69 72 20 |for usin|g their |
|00000100| 6f 75 74 70 75 74 20 74 | 6f 20 75 70 64 61 74 65 |output t|o update|
|00000110| 20 66 69 6c 65 73 2e 0a | 0a 20 20 20 43 6f 70 79 | files..|. Copy|
|00000120| 72 69 67 68 74 20 28 43 | 29 20 31 39 39 32 2c 20 |right (C|) 1992, |
|00000130| 31 39 39 33 2c 20 31 39 | 39 34 20 46 72 65 65 20 |1993, 19|94 Free |
|00000140| 53 6f 66 74 77 61 72 65 | 20 46 6f 75 6e 64 61 74 |Software| Foundat|
|00000150| 69 6f 6e 2c 20 49 6e 63 | 2e 0a 0a 20 20 20 50 65 |ion, Inc|... Pe|
|00000160| 72 6d 69 73 73 69 6f 6e | 20 69 73 20 67 72 61 6e |rmission| is gran|
|00000170| 74 65 64 20 74 6f 20 6d | 61 6b 65 20 61 6e 64 20 |ted to m|ake and |
|00000180| 64 69 73 74 72 69 62 75 | 74 65 20 76 65 72 62 61 |distribu|te verba|
|00000190| 74 69 6d 20 63 6f 70 69 | 65 73 20 6f 66 20 74 68 |tim copi|es of th|
|000001a0| 69 73 0a 6d 61 6e 75 61 | 6c 20 70 72 6f 76 69 64 |is.manua|l provid|
|000001b0| 65 64 20 74 68 65 20 63 | 6f 70 79 72 69 67 68 74 |ed the c|opyright|
|000001c0| 20 6e 6f 74 69 63 65 20 | 61 6e 64 20 74 68 69 73 | notice |and this|
|000001d0| 20 70 65 72 6d 69 73 73 | 69 6f 6e 20 6e 6f 74 69 | permiss|ion noti|
|000001e0| 63 65 20 61 72 65 0a 70 | 72 65 73 65 72 76 65 64 |ce are.p|reserved|
|000001f0| 20 6f 6e 20 61 6c 6c 20 | 63 6f 70 69 65 73 2e 0a | on all |copies..|
|00000200| 0a 20 20 20 50 65 72 6d | 69 73 73 69 6f 6e 20 69 |. Perm|ission i|
|00000210| 73 20 67 72 61 6e 74 65 | 64 20 74 6f 20 63 6f 70 |s grante|d to cop|
|00000220| 79 20 61 6e 64 20 64 69 | 73 74 72 69 62 75 74 65 |y and di|stribute|
|00000230| 20 6d 6f 64 69 66 69 65 | 64 20 76 65 72 73 69 6f | modifie|d versio|
|00000240| 6e 73 20 6f 66 0a 74 68 | 69 73 20 6d 61 6e 75 61 |ns of.th|is manua|
|00000250| 6c 20 75 6e 64 65 72 20 | 74 68 65 20 63 6f 6e 64 |l under |the cond|
|00000260| 69 74 69 6f 6e 73 20 66 | 6f 72 20 76 65 72 62 61 |itions f|or verba|
|00000270| 74 69 6d 20 63 6f 70 79 | 69 6e 67 2c 20 70 72 6f |tim copy|ing, pro|
|00000280| 76 69 64 65 64 20 74 68 | 61 74 0a 74 68 65 20 65 |vided th|at.the e|
|00000290| 6e 74 69 72 65 20 72 65 | 73 75 6c 74 69 6e 67 20 |ntire re|sulting |
|000002a0| 64 65 72 69 76 65 64 20 | 77 6f 72 6b 20 69 73 20 |derived |work is |
|000002b0| 64 69 73 74 72 69 62 75 | 74 65 64 20 75 6e 64 65 |distribu|ted unde|
|000002c0| 72 20 74 68 65 20 74 65 | 72 6d 73 20 6f 66 20 61 |r the te|rms of a|
|000002d0| 0a 70 65 72 6d 69 73 73 | 69 6f 6e 20 6e 6f 74 69 |.permiss|ion noti|
|000002e0| 63 65 20 69 64 65 6e 74 | 69 63 61 6c 20 74 6f 20 |ce ident|ical to |
|000002f0| 74 68 69 73 20 6f 6e 65 | 2e 0a 0a 20 20 20 50 65 |this one|... Pe|
|00000300| 72 6d 69 73 73 69 6f 6e | 20 69 73 20 67 72 61 6e |rmission| is gran|
|00000310| 74 65 64 20 74 6f 20 63 | 6f 70 79 20 61 6e 64 20 |ted to c|opy and |
|00000320| 64 69 73 74 72 69 62 75 | 74 65 20 74 72 61 6e 73 |distribu|te trans|
|00000330| 6c 61 74 69 6f 6e 73 20 | 6f 66 20 74 68 69 73 0a |lations |of this.|
|00000340| 6d 61 6e 75 61 6c 20 69 | 6e 74 6f 20 61 6e 6f 74 |manual i|nto anot|
|00000350| 68 65 72 20 6c 61 6e 67 | 75 61 67 65 2c 20 75 6e |her lang|uage, un|
|00000360| 64 65 72 20 74 68 65 20 | 61 62 6f 76 65 20 63 6f |der the |above co|
|00000370| 6e 64 69 74 69 6f 6e 73 | 20 66 6f 72 20 6d 6f 64 |nditions| for mod|
|00000380| 69 66 69 65 64 0a 76 65 | 72 73 69 6f 6e 73 2c 20 |ified.ve|rsions, |
|00000390| 65 78 63 65 70 74 20 74 | 68 61 74 20 74 68 69 73 |except t|hat this|
|000003a0| 20 70 65 72 6d 69 73 73 | 69 6f 6e 20 6e 6f 74 69 | permiss|ion noti|
|000003b0| 63 65 20 6d 61 79 20 62 | 65 20 73 74 61 74 65 64 |ce may b|e stated|
|000003c0| 20 69 6e 20 61 0a 74 72 | 61 6e 73 6c 61 74 69 6f | in a.tr|anslatio|
|000003d0| 6e 20 61 70 70 72 6f 76 | 65 64 20 62 79 20 74 68 |n approv|ed by th|
|000003e0| 65 20 46 6f 75 6e 64 61 | 74 69 6f 6e 2e 0a 0a 1f |e Founda|tion....|
|000003f0| 0a 46 69 6c 65 3a 20 64 | 69 66 66 2e 69 6e 66 6f |.File: d|iff.info|
|00000400| 2c 20 20 4e 6f 64 65 3a | 20 4c 69 6e 65 20 47 72 |, Node:| Line Gr|
|00000410| 6f 75 70 20 46 6f 72 6d | 61 74 73 2c 20 20 4e 65 |oup Form|ats, Ne|
|00000420| 78 74 3a 20 4c 69 6e 65 | 20 46 6f 72 6d 61 74 73 |xt: Line| Formats|
|00000430| 2c 20 20 55 70 3a 20 49 | 66 2d 74 68 65 6e 2d 65 |, Up: I|f-then-e|
|00000440| 6c 73 65 0a 0a 4c 69 6e | 65 20 47 72 6f 75 70 20 |lse..Lin|e Group |
|00000450| 46 6f 72 6d 61 74 73 0a | 2d 2d 2d 2d 2d 2d 2d 2d |Formats.|--------|
|00000460| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 0a 0a 20 20 20 4c |--------|--.. L|
|00000470| 69 6e 65 20 67 72 6f 75 | 70 20 66 6f 72 6d 61 74 |ine grou|p format|
|00000480| 73 20 6c 65 74 20 79 6f | 75 20 73 70 65 63 69 66 |s let yo|u specif|
|00000490| 79 20 66 6f 72 6d 61 74 | 73 20 73 75 69 74 61 62 |y format|s suitab|
|000004a0| 6c 65 20 66 6f 72 20 6d | 61 6e 79 0a 61 70 70 6c |le for m|any.appl|
|000004b0| 69 63 61 74 69 6f 6e 73 | 20 74 68 61 74 20 61 6c |ications| that al|
|000004c0| 6c 6f 77 20 69 66 2d 74 | 68 65 6e 2d 65 6c 73 65 |low if-t|hen-else|
|000004d0| 20 69 6e 70 75 74 2c 20 | 69 6e 63 6c 75 64 69 6e | input, |includin|
|000004e0| 67 20 70 72 6f 67 72 61 | 6d 6d 69 6e 67 0a 6c 61 |g progra|mming.la|
|000004f0| 6e 67 75 61 67 65 73 20 | 61 6e 64 20 74 65 78 74 |nguages |and text|
|00000500| 20 66 6f 72 6d 61 74 74 | 69 6e 67 20 6c 61 6e 67 | formatt|ing lang|
|00000510| 75 61 67 65 73 2e 20 20 | 41 20 6c 69 6e 65 20 67 |uages. |A line g|
|00000520| 72 6f 75 70 20 66 6f 72 | 6d 61 74 20 73 70 65 63 |roup for|mat spec|
|00000530| 69 66 69 65 73 0a 74 68 | 65 20 6f 75 74 70 75 74 |ifies.th|e output|
|00000540| 20 66 6f 72 6d 61 74 20 | 66 6f 72 20 61 20 63 6f | format |for a co|
|00000550| 6e 74 69 67 75 6f 75 73 | 20 67 72 6f 75 70 20 6f |ntiguous| group o|
|00000560| 66 20 73 69 6d 69 6c 61 | 72 20 6c 69 6e 65 73 2e |f simila|r lines.|
|00000570| 0a 0a 20 20 20 46 6f 72 | 20 65 78 61 6d 70 6c 65 |.. For| example|
|00000580| 2c 20 74 68 65 20 66 6f | 6c 6c 6f 77 69 6e 67 20 |, the fo|llowing |
|00000590| 63 6f 6d 6d 61 6e 64 20 | 63 6f 6d 70 61 72 65 73 |command |compares|
|000005a0| 20 74 68 65 20 54 65 58 | 20 66 69 6c 65 73 20 60 | the TeX| files `|
|000005b0| 6f 6c 64 27 20 61 6e 64 | 0a 60 6e 65 77 27 2c 20 |old' and|.`new', |
|000005c0| 61 6e 64 20 6f 75 74 70 | 75 74 73 20 61 20 6d 65 |and outp|uts a me|
|000005d0| 72 67 65 64 20 66 69 6c | 65 20 69 6e 20 77 68 69 |rged fil|e in whi|
|000005e0| 63 68 20 6f 6c 64 20 72 | 65 67 69 6f 6e 73 20 61 |ch old r|egions a|
|000005f0| 72 65 20 73 75 72 72 6f | 75 6e 64 65 64 20 62 79 |re surro|unded by|
|00000600| 0a 60 5c 62 65 67 69 6e | 7b 65 6d 7d 27 2d 60 5c |.`\begin|{em}'-`\|
|00000610| 65 6e 64 7b 65 6d 7d 27 | 20 6c 69 6e 65 73 2c 20 |end{em}'| lines, |
|00000620| 61 6e 64 20 6e 65 77 20 | 72 65 67 69 6f 6e 73 20 |and new |regions |
|00000630| 61 72 65 20 73 75 72 72 | 6f 75 6e 64 65 64 20 62 |are surr|ounded b|
|00000640| 79 0a 60 5c 62 65 67 69 | 6e 7b 62 66 7d 27 2d 60 |y.`\begi|n{bf}'-`|
|00000650| 5c 65 6e 64 7b 62 66 7d | 27 20 6c 69 6e 65 73 2e |\end{bf}|' lines.|
|00000660| 0a 0a 20 20 20 20 20 64 | 69 66 66 20 5c 0a 20 20 |.. d|iff \. |
|00000670| 20 20 20 20 20 20 2d 2d | 6f 6c 64 2d 67 72 6f 75 | --|old-grou|
|00000680| 70 2d 66 6f 72 6d 61 74 | 3d 27 5c 62 65 67 69 6e |p-format|='\begin|
|00000690| 7b 65 6d 7d 0a 20 20 20 | 20 20 25 3c 5c 65 6e 64 |{em}. | %<\end|
|000006a0| 7b 65 6d 7d 0a 20 20 20 | 20 20 27 20 5c 0a 20 20 |{em}. | ' \. |
|000006b0| 20 20 20 20 20 20 2d 2d | 6e 65 77 2d 67 72 6f 75 | --|new-grou|
|000006c0| 70 2d 66 6f 72 6d 61 74 | 3d 27 5c 62 65 67 69 6e |p-format|='\begin|
|000006d0| 7b 62 66 7d 0a 20 20 20 | 20 20 25 3e 5c 65 6e 64 |{bf}. | %>\end|
|000006e0| 7b 62 66 7d 0a 20 20 20 | 20 20 27 20 5c 0a 20 20 |{bf}. | ' \. |
|000006f0| 20 20 20 20 20 20 6f 6c | 64 20 6e 65 77 0a 0a 20 | ol|d new.. |
|00000700| 20 20 54 68 65 20 66 6f | 6c 6c 6f 77 69 6e 67 20 | The fo|llowing |
|00000710| 63 6f 6d 6d 61 6e 64 20 | 69 73 20 65 71 75 69 76 |command |is equiv|
|00000720| 61 6c 65 6e 74 20 74 6f | 20 74 68 65 20 61 62 6f |alent to| the abo|
|00000730| 76 65 20 65 78 61 6d 70 | 6c 65 2c 20 62 75 74 20 |ve examp|le, but |
|00000740| 69 74 20 69 73 20 61 0a | 6c 69 74 74 6c 65 20 6d |it is a.|little m|
|00000750| 6f 72 65 20 76 65 72 62 | 6f 73 65 2c 20 62 65 63 |ore verb|ose, bec|
|00000760| 61 75 73 65 20 69 74 20 | 73 70 65 6c 6c 73 20 6f |ause it |spells o|
|00000770| 75 74 20 74 68 65 20 64 | 65 66 61 75 6c 74 20 6c |ut the d|efault l|
|00000780| 69 6e 65 20 67 72 6f 75 | 70 0a 66 6f 72 6d 61 74 |ine grou|p.format|
|00000790| 73 2e 0a 0a 20 20 20 20 | 20 64 69 66 66 20 5c 0a |s... | diff \.|
|000007a0| 20 20 20 20 20 20 20 20 | 2d 2d 6f 6c 64 2d 67 72 | |--old-gr|
|000007b0| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 5c 62 65 67 |oup-form|at='\beg|
|000007c0| 69 6e 7b 65 6d 7d 0a 20 | 20 20 20 20 25 3c 5c 65 |in{em}. | %<\e|
|000007d0| 6e 64 7b 65 6d 7d 0a 20 | 20 20 20 20 27 20 5c 0a |nd{em}. | ' \.|
|000007e0| 20 20 20 20 20 20 20 20 | 2d 2d 6e 65 77 2d 67 72 | |--new-gr|
|000007f0| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 5c 62 65 67 |oup-form|at='\beg|
|00000800| 69 6e 7b 62 66 7d 0a 20 | 20 20 20 20 25 3e 5c 65 |in{bf}. | %>\e|
|00000810| 6e 64 7b 62 66 7d 0a 20 | 20 20 20 20 27 20 5c 0a |nd{bf}. | ' \.|
|00000820| 20 20 20 20 20 20 20 20 | 2d 2d 75 6e 63 68 61 6e | |--unchan|
|00000830| 67 65 64 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |ged-grou|p-format|
|00000840| 3d 27 25 3d 27 20 5c 0a | 20 20 20 20 20 20 20 20 |='%=' \.| |
|00000850| 2d 2d 63 68 61 6e 67 65 | 64 2d 67 72 6f 75 70 2d |--change|d-group-|
|00000860| 66 6f 72 6d 61 74 3d 27 | 5c 62 65 67 69 6e 7b 65 |format='|\begin{e|
|00000870| 6d 7d 0a 20 20 20 20 20 | 25 3c 5c 65 6e 64 7b 65 |m}. |%<\end{e|
|00000880| 6d 7d 0a 20 20 20 20 20 | 5c 62 65 67 69 6e 7b 62 |m}. |\begin{b|
|00000890| 66 7d 0a 20 20 20 20 20 | 25 3e 5c 65 6e 64 7b 62 |f}. |%>\end{b|
|000008a0| 66 7d 0a 20 20 20 20 20 | 27 20 5c 0a 20 20 20 20 |f}. |' \. |
|000008b0| 20 20 20 20 6f 6c 64 20 | 6e 65 77 0a 0a 20 20 20 | old |new.. |
|000008c0| 48 65 72 65 20 69 73 20 | 61 20 6d 6f 72 65 20 61 |Here is |a more a|
|000008d0| 64 76 61 6e 63 65 64 20 | 65 78 61 6d 70 6c 65 2c |dvanced |example,|
|000008e0| 20 77 68 69 63 68 20 6f | 75 74 70 75 74 73 20 61 | which o|utputs a|
|000008f0| 20 64 69 66 66 20 6c 69 | 73 74 69 6e 67 20 77 69 | diff li|sting wi|
|00000900| 74 68 0a 68 65 61 64 65 | 72 73 20 63 6f 6e 74 61 |th.heade|rs conta|
|00000910| 69 6e 69 6e 67 20 6c 69 | 6e 65 20 6e 75 6d 62 65 |ining li|ne numbe|
|00000920| 72 73 20 69 6e 20 61 20 | 22 70 6c 61 69 6e 20 45 |rs in a |"plain E|
|00000930| 6e 67 6c 69 73 68 22 20 | 73 74 79 6c 65 2e 0a 0a |nglish" |style...|
|00000940| 20 20 20 20 20 64 69 66 | 66 20 5c 0a 20 20 20 20 | dif|f \. |
|00000950| 20 20 20 20 2d 2d 75 6e | 63 68 61 6e 67 65 64 2d | --un|changed-|
|00000960| 67 72 6f 75 70 2d 66 6f | 72 6d 61 74 3d 27 27 20 |group-fo|rmat='' |
|00000970| 5c 0a 20 20 20 20 20 20 | 20 20 2d 2d 6f 6c 64 2d |\. | --old-|
|00000980| 67 72 6f 75 70 2d 66 6f | 72 6d 61 74 3d 27 2d 2d |group-fo|rmat='--|
|00000990| 2d 2d 2d 2d 2d 2d 20 25 | 64 6e 20 6c 69 6e 65 25 |------ %|dn line%|
|000009a0| 28 6e 3d 31 3f 3a 73 29 | 20 64 65 6c 65 74 65 64 |(n=1?:s)| deleted|
|000009b0| 20 61 74 20 25 64 66 3a | 0a 20 20 20 20 20 25 3c | at %df:|. %<|
|000009c0| 27 20 5c 0a 20 20 20 20 | 20 20 20 20 2d 2d 6e 65 |' \. | --ne|
|000009d0| 77 2d 67 72 6f 75 70 2d | 66 6f 72 6d 61 74 3d 27 |w-group-|format='|
|000009e0| 2d 2d 2d 2d 2d 2d 2d 2d | 20 25 64 4e 20 6c 69 6e |--------| %dN lin|
|000009f0| 65 25 28 4e 3d 31 3f 3a | 73 29 20 61 64 64 65 64 |e%(N=1?:|s) added|
|00000a00| 20 61 66 74 65 72 20 25 | 64 65 3a 0a 20 20 20 20 | after %|de:. |
|00000a10| 20 25 3e 27 20 5c 0a 20 | 20 20 20 20 20 20 20 2d | %>' \. | -|
|00000a20| 2d 63 68 61 6e 67 65 64 | 2d 67 72 6f 75 70 2d 66 |-changed|-group-f|
|00000a30| 6f 72 6d 61 74 3d 27 2d | 2d 2d 2d 2d 2d 2d 2d 20 |ormat='-|------- |
|00000a40| 25 64 6e 20 6c 69 6e 65 | 25 28 6e 3d 31 3f 3a 73 |%dn line|%(n=1?:s|
|00000a50| 29 20 63 68 61 6e 67 65 | 64 20 61 74 20 25 64 66 |) change|d at %df|
|00000a60| 3a 0a 20 20 20 20 20 25 | 3c 2d 2d 2d 2d 2d 2d 2d |:. %|<-------|
|00000a70| 2d 20 74 6f 3a 0a 20 20 | 20 20 20 25 3e 27 20 5c |- to:. | %>' \|
|00000a80| 0a 20 20 20 20 20 20 20 | 20 6f 6c 64 20 6e 65 77 |. | old new|
|00000a90| 0a 0a 20 20 20 54 6f 20 | 73 70 65 63 69 66 79 20 |.. To |specify |
|00000aa0| 61 20 6c 69 6e 65 20 67 | 72 6f 75 70 20 66 6f 72 |a line g|roup for|
|00000ab0| 6d 61 74 2c 20 75 73 65 | 20 60 64 69 66 66 27 20 |mat, use| `diff' |
|00000ac0| 77 69 74 68 20 6f 6e 65 | 20 6f 66 20 74 68 65 20 |with one| of the |
|00000ad0| 6f 70 74 69 6f 6e 73 0a | 6c 69 73 74 65 64 20 62 |options.|listed b|
|00000ae0| 65 6c 6f 77 2e 20 20 59 | 6f 75 20 63 61 6e 20 73 |elow. Y|ou can s|
|00000af0| 70 65 63 69 66 79 20 75 | 70 20 74 6f 20 66 6f 75 |pecify u|p to fou|
|00000b00| 72 20 6c 69 6e 65 20 67 | 72 6f 75 70 20 66 6f 72 |r line g|roup for|
|00000b10| 6d 61 74 73 2c 20 6f 6e | 65 20 66 6f 72 0a 65 61 |mats, on|e for.ea|
|00000b20| 63 68 20 6b 69 6e 64 20 | 6f 66 20 6c 69 6e 65 20 |ch kind |of line |
|00000b30| 67 72 6f 75 70 2e 20 20 | 59 6f 75 20 73 68 6f 75 |group. |You shou|
|00000b40| 6c 64 20 71 75 6f 74 65 | 20 46 4f 52 4d 41 54 2c |ld quote| FORMAT,|
|00000b50| 20 62 65 63 61 75 73 65 | 20 69 74 20 74 79 70 69 | because| it typi|
|00000b60| 63 61 6c 6c 79 0a 63 6f | 6e 74 61 69 6e 73 20 73 |cally.co|ntains s|
|00000b70| 68 65 6c 6c 20 6d 65 74 | 61 63 68 61 72 61 63 74 |hell met|acharact|
|00000b80| 65 72 73 2e 0a 0a 60 2d | 2d 6f 6c 64 2d 67 72 6f |ers...`-|-old-gro|
|00000b90| 75 70 2d 66 6f 72 6d 61 | 74 3d 46 4f 52 4d 41 54 |up-forma|t=FORMAT|
|00000ba0| 27 0a 20 20 20 20 20 54 | 68 65 73 65 20 6c 69 6e |'. T|hese lin|
|00000bb0| 65 20 67 72 6f 75 70 73 | 20 61 72 65 20 68 75 6e |e groups| are hun|
|00000bc0| 6b 73 20 63 6f 6e 74 61 | 69 6e 69 6e 67 20 6f 6e |ks conta|ining on|
|00000bd0| 6c 79 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 74 68 |ly lines| from th|
|00000be0| 65 20 66 69 72 73 74 0a | 20 20 20 20 20 66 69 6c |e first.| fil|
|00000bf0| 65 2e 20 20 54 68 65 20 | 64 65 66 61 75 6c 74 20 |e. The |default |
|00000c00| 6f 6c 64 20 67 72 6f 75 | 70 20 66 6f 72 6d 61 74 |old grou|p format|
|00000c10| 20 69 73 20 74 68 65 20 | 73 61 6d 65 20 61 73 20 | is the |same as |
|00000c20| 74 68 65 20 63 68 61 6e | 67 65 64 0a 20 20 20 20 |the chan|ged. |
|00000c30| 20 67 72 6f 75 70 20 66 | 6f 72 6d 61 74 20 69 66 | group f|ormat if|
|00000c40| 20 69 74 20 69 73 20 73 | 70 65 63 69 66 69 65 64 | it is s|pecified|
|00000c50| 3b 20 6f 74 68 65 72 77 | 69 73 65 20 69 74 20 69 |; otherw|ise it i|
|00000c60| 73 20 61 20 66 6f 72 6d | 61 74 20 74 68 61 74 0a |s a form|at that.|
|00000c70| 20 20 20 20 20 6f 75 74 | 70 75 74 73 20 74 68 65 | out|puts the|
|00000c80| 20 6c 69 6e 65 20 67 72 | 6f 75 70 20 61 73 2d 69 | line gr|oup as-i|
|00000c90| 73 2e 0a 0a 60 2d 2d 6e | 65 77 2d 67 72 6f 75 70 |s...`--n|ew-group|
|00000ca0| 2d 66 6f 72 6d 61 74 3d | 46 4f 52 4d 41 54 27 0a |-format=|FORMAT'.|
|00000cb0| 20 20 20 20 20 54 68 65 | 73 65 20 6c 69 6e 65 20 | The|se line |
|00000cc0| 67 72 6f 75 70 73 20 61 | 72 65 20 68 75 6e 6b 73 |groups a|re hunks|
|00000cd0| 20 63 6f 6e 74 61 69 6e | 69 6e 67 20 6f 6e 6c 79 | contain|ing only|
|00000ce0| 20 6c 69 6e 65 73 20 66 | 72 6f 6d 20 74 68 65 20 | lines f|rom the |
|00000cf0| 73 65 63 6f 6e 64 0a 20 | 20 20 20 20 66 69 6c 65 |second. | file|
|00000d00| 2e 20 20 54 68 65 20 64 | 65 66 61 75 6c 74 20 6e |. The d|efault n|
|00000d10| 65 77 20 67 72 6f 75 70 | 20 66 6f 72 6d 61 74 20 |ew group| format |
|00000d20| 69 73 20 73 61 6d 65 20 | 61 73 20 74 68 65 20 74 |is same |as the t|
|00000d30| 68 65 20 63 68 61 6e 67 | 65 64 0a 20 20 20 20 20 |he chang|ed. |
|00000d40| 67 72 6f 75 70 20 66 6f | 72 6d 61 74 20 69 66 20 |group fo|rmat if |
|00000d50| 69 74 20 69 73 20 73 70 | 65 63 69 66 69 65 64 3b |it is sp|ecified;|
|00000d60| 20 6f 74 68 65 72 77 69 | 73 65 20 69 74 20 69 73 | otherwi|se it is|
|00000d70| 20 61 20 66 6f 72 6d 61 | 74 20 74 68 61 74 0a 20 | a forma|t that. |
|00000d80| 20 20 20 20 6f 75 74 70 | 75 74 73 20 74 68 65 20 | outp|uts the |
|00000d90| 6c 69 6e 65 20 67 72 6f | 75 70 20 61 73 2d 69 73 |line gro|up as-is|
|00000da0| 2e 0a 0a 60 2d 2d 63 68 | 61 6e 67 65 64 2d 67 72 |...`--ch|anged-gr|
|00000db0| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 46 4f 52 4d 41 |oup-form|at=FORMA|
|00000dc0| 54 27 0a 20 20 20 20 20 | 54 68 65 73 65 20 6c 69 |T'. |These li|
|00000dd0| 6e 65 20 67 72 6f 75 70 | 73 20 61 72 65 20 68 75 |ne group|s are hu|
|00000de0| 6e 6b 73 20 63 6f 6e 74 | 61 69 6e 69 6e 67 20 6c |nks cont|aining l|
|00000df0| 69 6e 65 73 20 66 72 6f | 6d 20 62 6f 74 68 20 66 |ines fro|m both f|
|00000e00| 69 6c 65 73 2e 20 20 54 | 68 65 0a 20 20 20 20 20 |iles. T|he. |
|00000e10| 64 65 66 61 75 6c 74 20 | 63 68 61 6e 67 65 64 20 |default |changed |
|00000e20| 67 72 6f 75 70 20 66 6f | 72 6d 61 74 20 69 73 20 |group fo|rmat is |
|00000e30| 74 68 65 20 63 6f 6e 63 | 61 74 65 6e 61 74 69 6f |the conc|atenatio|
|00000e40| 6e 20 6f 66 20 74 68 65 | 20 6f 6c 64 20 61 6e 64 |n of the| old and|
|00000e50| 0a 20 20 20 20 20 6e 65 | 77 20 67 72 6f 75 70 20 |. ne|w group |
|00000e60| 66 6f 72 6d 61 74 73 2e | 0a 0a 60 2d 2d 75 6e 63 |formats.|..`--unc|
|00000e70| 68 61 6e 67 65 64 2d 67 | 72 6f 75 70 2d 66 6f 72 |hanged-g|roup-for|
|00000e80| 6d 61 74 3d 46 4f 52 4d | 41 54 27 0a 20 20 20 20 |mat=FORM|AT'. |
|00000e90| 20 54 68 65 73 65 20 6c | 69 6e 65 20 67 72 6f 75 | These l|ine grou|
|00000ea0| 70 73 20 63 6f 6e 74 61 | 69 6e 20 6c 69 6e 65 73 |ps conta|in lines|
|00000eb0| 20 63 6f 6d 6d 6f 6e 20 | 74 6f 20 62 6f 74 68 20 | common |to both |
|00000ec0| 66 69 6c 65 73 2e 20 20 | 54 68 65 20 64 65 66 61 |files. |The defa|
|00000ed0| 75 6c 74 0a 20 20 20 20 | 20 75 6e 63 68 61 6e 67 |ult. | unchang|
|00000ee0| 65 64 20 67 72 6f 75 70 | 20 66 6f 72 6d 61 74 20 |ed group| format |
|00000ef0| 69 73 20 61 20 66 6f 72 | 6d 61 74 20 74 68 61 74 |is a for|mat that|
|00000f00| 20 6f 75 74 70 75 74 73 | 20 74 68 65 20 6c 69 6e | outputs| the lin|
|00000f10| 65 20 67 72 6f 75 70 0a | 20 20 20 20 20 61 73 2d |e group.| as-|
|00000f20| 69 73 2e 0a 0a 20 20 20 | 49 6e 20 61 20 6c 69 6e |is... |In a lin|
|00000f30| 65 20 67 72 6f 75 70 20 | 66 6f 72 6d 61 74 2c 20 |e group |format, |
|00000f40| 6f 72 64 69 6e 61 72 79 | 20 63 68 61 72 61 63 74 |ordinary| charact|
|00000f50| 65 72 73 20 72 65 70 72 | 65 73 65 6e 74 20 74 68 |ers repr|esent th|
|00000f60| 65 6d 73 65 6c 76 65 73 | 3b 0a 63 6f 6e 76 65 72 |emselves|;.conver|
|00000f70| 73 69 6f 6e 20 73 70 65 | 63 69 66 69 63 61 74 69 |sion spe|cificati|
|00000f80| 6f 6e 73 20 73 74 61 72 | 74 20 77 69 74 68 20 60 |ons star|t with `|
|00000f90| 25 27 20 61 6e 64 20 68 | 61 76 65 20 6f 6e 65 20 |%' and h|ave one |
|00000fa0| 6f 66 20 74 68 65 20 66 | 6f 6c 6c 6f 77 69 6e 67 |of the f|ollowing|
|00000fb0| 0a 66 6f 72 6d 73 2e 0a | 0a 60 25 3c 27 0a 20 20 |.forms..|.`%<'. |
|00000fc0| 20 20 20 73 74 61 6e 64 | 73 20 66 6f 72 20 74 68 | stand|s for th|
|00000fd0| 65 20 6c 69 6e 65 73 20 | 66 72 6f 6d 20 74 68 65 |e lines |from the|
|00000fe0| 20 66 69 72 73 74 20 66 | 69 6c 65 2c 20 69 6e 63 | first f|ile, inc|
|00000ff0| 6c 75 64 69 6e 67 20 74 | 68 65 20 74 72 61 69 6c |luding t|he trail|
|00001000| 69 6e 67 0a 20 20 20 20 | 20 6e 65 77 6c 69 6e 65 |ing. | newline|
|00001010| 2e 20 20 45 61 63 68 20 | 6c 69 6e 65 20 69 73 20 |. Each |line is |
|00001020| 66 6f 72 6d 61 74 74 65 | 64 20 61 63 63 6f 72 64 |formatte|d accord|
|00001030| 69 6e 67 20 74 6f 20 74 | 68 65 20 6f 6c 64 20 6c |ing to t|he old l|
|00001040| 69 6e 65 20 66 6f 72 6d | 61 74 0a 20 20 20 20 20 |ine form|at. |
|00001050| 28 2a 6e 6f 74 65 20 4c | 69 6e 65 20 46 6f 72 6d |(*note L|ine Form|
|00001060| 61 74 73 3a 3a 2e 29 2e | 0a 0a 60 25 3e 27 0a 20 |ats::.).|..`%>'. |
|00001070| 20 20 20 20 73 74 61 6e | 64 73 20 66 6f 72 20 74 | stan|ds for t|
|00001080| 68 65 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 74 68 |he lines| from th|
|00001090| 65 20 73 65 63 6f 6e 64 | 20 66 69 6c 65 2c 20 69 |e second| file, i|
|000010a0| 6e 63 6c 75 64 69 6e 67 | 20 74 68 65 20 74 72 61 |ncluding| the tra|
|000010b0| 69 6c 69 6e 67 0a 20 20 | 20 20 20 6e 65 77 6c 69 |iling. | newli|
|000010c0| 6e 65 2e 20 20 45 61 63 | 68 20 6c 69 6e 65 20 69 |ne. Eac|h line i|
|000010d0| 73 20 66 6f 72 6d 61 74 | 74 65 64 20 61 63 63 6f |s format|ted acco|
|000010e0| 72 64 69 6e 67 20 74 6f | 20 74 68 65 20 6e 65 77 |rding to| the new|
|000010f0| 20 6c 69 6e 65 20 66 6f | 72 6d 61 74 2e 0a 0a 60 | line fo|rmat...`|
|00001100| 25 3d 27 0a 20 20 20 20 | 20 73 74 61 6e 64 73 20 |%='. | stands |
|00001110| 66 6f 72 20 74 68 65 20 | 6c 69 6e 65 73 20 63 6f |for the |lines co|
|00001120| 6d 6d 6f 6e 20 74 6f 20 | 62 6f 74 68 20 66 69 6c |mmon to |both fil|
|00001130| 65 73 2c 20 69 6e 63 6c | 75 64 69 6e 67 20 74 68 |es, incl|uding th|
|00001140| 65 20 74 72 61 69 6c 69 | 6e 67 0a 20 20 20 20 20 |e traili|ng. |
|00001150| 6e 65 77 6c 69 6e 65 2e | 20 20 45 61 63 68 20 6c |newline.| Each l|
|00001160| 69 6e 65 20 69 73 20 66 | 6f 72 6d 61 74 74 65 64 |ine is f|ormatted|
|00001170| 20 61 63 63 6f 72 64 69 | 6e 67 20 74 6f 20 74 68 | accordi|ng to th|
|00001180| 65 20 75 6e 63 68 61 6e | 67 65 64 20 6c 69 6e 65 |e unchan|ged line|
|00001190| 0a 20 20 20 20 20 66 6f | 72 6d 61 74 2e 0a 0a 60 |. fo|rmat...`|
|000011a0| 25 25 27 0a 20 20 20 20 | 20 73 74 61 6e 64 73 20 |%%'. | stands |
|000011b0| 66 6f 72 20 60 25 27 2e | 0a 0a 60 25 63 27 43 27 |for `%'.|..`%c'C'|
|000011c0| 27 0a 20 20 20 20 20 77 | 68 65 72 65 20 43 20 69 |'. w|here C i|
|000011d0| 73 20 61 20 73 69 6e 67 | 6c 65 20 63 68 61 72 61 |s a sing|le chara|
|000011e0| 63 74 65 72 2c 20 73 74 | 61 6e 64 73 20 66 6f 72 |cter, st|ands for|
|000011f0| 20 43 2e 20 20 43 20 6d | 61 79 20 6e 6f 74 20 62 | C. C m|ay not b|
|00001200| 65 20 61 0a 20 20 20 20 | 20 62 61 63 6b 73 6c 61 |e a. | backsla|
|00001210| 73 68 20 6f 72 20 61 6e | 20 61 70 6f 73 74 72 6f |sh or an| apostro|
|00001220| 70 68 65 2e 20 20 46 6f | 72 20 65 78 61 6d 70 6c |phe. Fo|r exampl|
|00001230| 65 2c 20 60 25 63 27 3a | 27 27 20 73 74 61 6e 64 |e, `%c':|'' stand|
|00001240| 73 20 66 6f 72 20 61 0a | 20 20 20 20 20 63 6f 6c |s for a.| col|
|00001250| 6f 6e 2c 20 65 76 65 6e | 20 69 6e 73 69 64 65 20 |on, even| inside |
|00001260| 74 68 65 20 74 68 65 6e | 2d 70 61 72 74 20 6f 66 |the then|-part of|
|00001270| 20 61 6e 20 69 66 2d 74 | 68 65 6e 2d 65 6c 73 65 | an if-t|hen-else|
|00001280| 20 66 6f 72 6d 61 74 2c | 20 77 68 69 63 68 0a 20 | format,| which. |
|00001290| 20 20 20 20 61 20 63 6f | 6c 6f 6e 20 77 6f 75 6c | a co|lon woul|
|000012a0| 64 20 6e 6f 72 6d 61 6c | 6c 79 20 74 65 72 6d 69 |d normal|ly termi|
|000012b0| 6e 61 74 65 2e 0a 0a 60 | 25 63 27 5c 4f 27 27 0a |nate...`|%c'\O''.|
|000012c0| 20 20 20 20 20 77 68 65 | 72 65 20 4f 20 69 73 20 | whe|re O is |
|000012d0| 61 20 73 74 72 69 6e 67 | 20 6f 66 20 31 2c 20 32 |a string| of 1, 2|
|000012e0| 2c 20 6f 72 20 33 20 6f | 63 74 61 6c 20 64 69 67 |, or 3 o|ctal dig|
|000012f0| 69 74 73 2c 20 73 74 61 | 6e 64 73 20 66 6f 72 20 |its, sta|nds for |
|00001300| 74 68 65 0a 20 20 20 20 | 20 63 68 61 72 61 63 74 |the. | charact|
|00001310| 65 72 20 77 69 74 68 20 | 6f 63 74 61 6c 20 63 6f |er with |octal co|
|00001320| 64 65 20 4f 2e 20 20 46 | 6f 72 20 65 78 61 6d 70 |de O. F|or examp|
|00001330| 6c 65 2c 20 60 25 63 27 | 5c 30 27 27 20 73 74 61 |le, `%c'|\0'' sta|
|00001340| 6e 64 73 20 66 6f 72 20 | 61 0a 20 20 20 20 20 6e |nds for |a. n|
|00001350| 75 6c 6c 20 63 68 61 72 | 61 63 74 65 72 2e 0a 0a |ull char|acter...|
|00001360| 60 46 4e 27 0a 20 20 20 | 20 20 77 68 65 72 65 20 |`FN'. | where |
|00001370| 46 20 69 73 20 61 20 60 | 70 72 69 6e 74 66 27 20 |F is a `|printf' |
|00001380| 63 6f 6e 76 65 72 73 69 | 6f 6e 20 73 70 65 63 69 |conversi|on speci|
|00001390| 66 69 63 61 74 69 6f 6e | 20 61 6e 64 20 4e 20 69 |fication| and N i|
|000013a0| 73 20 6f 6e 65 20 6f 66 | 20 74 68 65 0a 20 20 20 |s one of| the. |
|000013b0| 20 20 66 6f 6c 6c 6f 77 | 69 6e 67 20 6c 65 74 74 | follow|ing lett|
|000013c0| 65 72 73 2c 20 73 74 61 | 6e 64 73 20 66 6f 72 20 |ers, sta|nds for |
|000013d0| 4e 27 73 20 76 61 6c 75 | 65 20 66 6f 72 6d 61 74 |N's valu|e format|
|000013e0| 74 65 64 20 77 69 74 68 | 20 46 2e 0a 0a 20 20 20 |ted with| F... |
|000013f0| 20 60 65 27 0a 20 20 20 | 20 20 20 20 20 20 20 54 | `e'. | T|
|00001400| 68 65 20 6c 69 6e 65 20 | 6e 75 6d 62 65 72 20 6f |he line |number o|
|00001410| 66 20 74 68 65 20 6c 69 | 6e 65 20 6a 75 73 74 20 |f the li|ne just |
|00001420| 62 65 66 6f 72 65 20 74 | 68 65 20 67 72 6f 75 70 |before t|he group|
|00001430| 20 69 6e 20 74 68 65 20 | 6f 6c 64 0a 20 20 20 20 | in the |old. |
|00001440| 20 20 20 20 20 20 66 69 | 6c 65 2e 0a 0a 20 20 20 | fi|le... |
|00001450| 20 60 66 27 0a 20 20 20 | 20 20 20 20 20 20 20 54 | `f'. | T|
|00001460| 68 65 20 6c 69 6e 65 20 | 6e 75 6d 62 65 72 20 6f |he line |number o|
|00001470| 66 20 74 68 65 20 66 69 | 72 73 74 20 6c 69 6e 65 |f the fi|rst line|
|00001480| 20 69 6e 20 74 68 65 20 | 67 72 6f 75 70 20 69 6e | in the |group in|
|00001490| 20 74 68 65 20 6f 6c 64 | 0a 20 20 20 20 20 20 20 | the old|. |
|000014a0| 20 20 20 66 69 6c 65 3b | 20 65 71 75 61 6c 73 20 | file;| equals |
|000014b0| 45 20 2b 20 31 2e 0a 0a | 20 20 20 20 60 6c 27 0a |E + 1...| `l'.|
|000014c0| 20 20 20 20 20 20 20 20 | 20 20 54 68 65 20 6c 69 | | The li|
|000014d0| 6e 65 20 6e 75 6d 62 65 | 72 20 6f 66 20 74 68 65 |ne numbe|r of the|
|000014e0| 20 6c 61 73 74 20 6c 69 | 6e 65 20 69 6e 20 74 68 | last li|ne in th|
|000014f0| 65 20 67 72 6f 75 70 20 | 69 6e 20 74 68 65 20 6f |e group |in the o|
|00001500| 6c 64 20 66 69 6c 65 2e | 0a 0a 20 20 20 20 60 6d |ld file.|.. `m|
|00001510| 27 0a 20 20 20 20 20 20 | 20 20 20 20 54 68 65 20 |'. | The |
|00001520| 6c 69 6e 65 20 6e 75 6d | 62 65 72 20 6f 66 20 74 |line num|ber of t|
|00001530| 68 65 20 6c 69 6e 65 20 | 6a 75 73 74 20 61 66 74 |he line |just aft|
|00001540| 65 72 20 74 68 65 20 67 | 72 6f 75 70 20 69 6e 20 |er the g|roup in |
|00001550| 74 68 65 20 6f 6c 64 0a | 20 20 20 20 20 20 20 20 |the old.| |
|00001560| 20 20 66 69 6c 65 3b 20 | 65 71 75 61 6c 73 20 4c | file; |equals L|
|00001570| 20 2b 20 31 2e 0a 0a 20 | 20 20 20 60 6e 27 0a 20 | + 1... | `n'. |
|00001580| 20 20 20 20 20 20 20 20 | 20 54 68 65 20 6e 75 6d | | The num|
|00001590| 62 65 72 20 6f 66 20 6c | 69 6e 65 73 20 69 6e 20 |ber of l|ines in |
|000015a0| 74 68 65 20 67 72 6f 75 | 70 20 69 6e 20 74 68 65 |the grou|p in the|
|000015b0| 20 6f 6c 64 20 66 69 6c | 65 3b 20 65 71 75 61 6c | old fil|e; equal|
|000015c0| 73 20 4c 20 2d 0a 20 20 | 20 20 20 20 20 20 20 20 |s L -. | |
|000015d0| 46 20 2b 20 31 2e 0a 0a | 20 20 20 20 60 45 2c 20 |F + 1...| `E, |
|000015e0| 46 2c 20 4c 2c 20 4d 2c | 20 4e 27 0a 20 20 20 20 |F, L, M,| N'. |
|000015f0| 20 20 20 20 20 20 4c 69 | 6b 65 77 69 73 65 2c 20 | Li|kewise, |
|00001600| 66 6f 72 20 6c 69 6e 65 | 73 20 69 6e 20 74 68 65 |for line|s in the|
|00001610| 20 6e 65 77 20 66 69 6c | 65 2e 0a 0a 20 20 20 20 | new fil|e... |
|00001620| 20 54 68 65 20 60 70 72 | 69 6e 74 66 27 20 63 6f | The `pr|intf' co|
|00001630| 6e 76 65 72 73 69 6f 6e | 20 73 70 65 63 69 66 69 |nversion| specifi|
|00001640| 63 61 74 69 6f 6e 20 63 | 61 6e 20 62 65 20 60 25 |cation c|an be `%|
|00001650| 64 27 2c 20 60 25 6f 27 | 2c 20 60 25 78 27 2c 20 |d', `%o'|, `%x', |
|00001660| 6f 72 0a 20 20 20 20 20 | 60 25 58 27 2c 20 73 70 |or. |`%X', sp|
|00001670| 65 63 69 66 79 69 6e 67 | 20 64 65 63 69 6d 61 6c |ecifying| decimal|
|00001680| 2c 20 6f 63 74 61 6c 2c | 20 6c 6f 77 65 72 20 63 |, octal,| lower c|
|00001690| 61 73 65 20 68 65 78 61 | 64 65 63 69 6d 61 6c 2c |ase hexa|decimal,|
|000016a0| 20 6f 72 20 75 70 70 65 | 72 0a 20 20 20 20 20 63 | or uppe|r. c|
|000016b0| 61 73 65 20 68 65 78 61 | 64 65 63 69 6d 61 6c 20 |ase hexa|decimal |
|000016c0| 6f 75 74 70 75 74 20 72 | 65 73 70 65 63 74 69 76 |output r|espectiv|
|000016d0| 65 6c 79 2e 20 20 41 66 | 74 65 72 20 74 68 65 20 |ely. Af|ter the |
|000016e0| 60 25 27 20 74 68 65 20 | 66 6f 6c 6c 6f 77 69 6e |`%' the |followin|
|000016f0| 67 0a 20 20 20 20 20 6f | 70 74 69 6f 6e 73 20 63 |g. o|ptions c|
|00001700| 61 6e 20 61 70 70 65 61 | 72 20 69 6e 20 73 65 71 |an appea|r in seq|
|00001710| 75 65 6e 63 65 3a 20 61 | 20 60 2d 27 20 73 70 65 |uence: a| `-' spe|
|00001720| 63 69 66 79 69 6e 67 0a | 20 20 20 20 20 6c 65 66 |cifying.| lef|
|00001730| 74 2d 6a 75 73 74 69 66 | 69 63 61 74 69 6f 6e 3b |t-justif|ication;|
|00001740| 20 61 6e 20 69 6e 74 65 | 67 65 72 20 73 70 65 63 | an inte|ger spec|
|00001750| 69 66 79 69 6e 67 20 74 | 68 65 20 6d 69 6e 69 6d |ifying t|he minim|
|00001760| 75 6d 20 66 69 65 6c 64 | 20 77 69 64 74 68 3b 0a |um field| width;.|
|00001770| 20 20 20 20 20 61 6e 64 | 20 61 20 70 65 72 69 6f | and| a perio|
|00001780| 64 20 66 6f 6c 6c 6f 77 | 65 64 20 62 79 20 61 6e |d follow|ed by an|
|00001790| 20 6f 70 74 69 6f 6e 61 | 6c 20 69 6e 74 65 67 65 | optiona|l intege|
|000017a0| 72 20 73 70 65 63 69 66 | 79 69 6e 67 20 74 68 65 |r specif|ying the|
|000017b0| 0a 20 20 20 20 20 6d 69 | 6e 69 6d 75 6d 20 6e 75 |. mi|nimum nu|
|000017c0| 6d 62 65 72 20 6f 66 20 | 64 69 67 69 74 73 2e 20 |mber of |digits. |
|000017d0| 20 46 6f 72 20 65 78 61 | 6d 70 6c 65 2c 20 60 25 | For exa|mple, `%|
|000017e0| 35 64 4e 27 20 70 72 69 | 6e 74 73 20 74 68 65 20 |5dN' pri|nts the |
|000017f0| 6e 75 6d 62 65 72 0a 20 | 20 20 20 20 6f 66 20 6e |number. | of n|
|00001800| 65 77 20 6c 69 6e 65 73 | 20 69 6e 20 74 68 65 20 |ew lines| in the |
|00001810| 67 72 6f 75 70 20 69 6e | 20 61 20 66 69 65 6c 64 |group in| a field|
|00001820| 20 6f 66 20 77 69 64 74 | 68 20 35 20 63 68 61 72 | of widt|h 5 char|
|00001830| 61 63 74 65 72 73 2c 20 | 75 73 69 6e 67 0a 20 20 |acters, |using. |
|00001840| 20 20 20 74 68 65 20 60 | 70 72 69 6e 74 66 27 20 | the `|printf' |
|00001850| 66 6f 72 6d 61 74 20 60 | 22 25 35 64 22 27 2e 0a |format `|"%5d"'..|
|00001860| 0a 60 28 41 3d 42 3f 54 | 3a 45 29 27 0a 20 20 20 |.`(A=B?T|:E)'. |
|00001870| 20 20 49 66 20 41 20 65 | 71 75 61 6c 73 20 42 20 | If A e|quals B |
|00001880| 74 68 65 6e 20 54 20 65 | 6c 73 65 20 45 2e 20 20 |then T e|lse E. |
|00001890| 41 20 61 6e 64 20 42 20 | 61 72 65 20 65 61 63 68 |A and B |are each|
|000018a0| 20 65 69 74 68 65 72 20 | 61 20 64 65 63 69 6d 61 | either |a decima|
|000018b0| 6c 0a 20 20 20 20 20 63 | 6f 6e 73 74 61 6e 74 20 |l. c|onstant |
|000018c0| 6f 72 20 61 20 73 69 6e | 67 6c 65 20 6c 65 74 74 |or a sin|gle lett|
|000018d0| 65 72 20 69 6e 74 65 72 | 70 72 65 74 65 64 20 61 |er inter|preted a|
|000018e0| 73 20 61 62 6f 76 65 2e | 20 20 54 68 69 73 20 66 |s above.| This f|
|000018f0| 6f 72 6d 61 74 0a 20 20 | 20 20 20 73 70 65 63 20 |ormat. | spec |
|00001900| 69 73 20 65 71 75 69 76 | 61 6c 65 6e 74 20 74 6f |is equiv|alent to|
|00001910| 20 54 20 69 66 20 41 27 | 73 20 76 61 6c 75 65 20 | T if A'|s value |
|00001920| 65 71 75 61 6c 73 20 42 | 27 73 3b 20 6f 74 68 65 |equals B|'s; othe|
|00001930| 72 77 69 73 65 20 69 74 | 20 69 73 0a 20 20 20 20 |rwise it| is. |
|00001940| 20 65 71 75 69 76 61 6c | 65 6e 74 20 74 6f 20 45 | equival|ent to E|
|00001950| 2e 0a 0a 20 20 20 20 20 | 46 6f 72 20 65 78 61 6d |... |For exam|
|00001960| 70 6c 65 2c 20 60 25 28 | 4e 3d 30 3f 6e 6f 3a 25 |ple, `%(|N=0?no:%|
|00001970| 64 4e 29 20 6c 69 6e 65 | 25 28 4e 3d 31 3f 3a 73 |dN) line|%(N=1?:s|
|00001980| 29 27 20 69 73 20 65 71 | 75 69 76 61 6c 65 6e 74 |)' is eq|uivalent|
|00001990| 20 74 6f 20 60 6e 6f 0a | 20 20 20 20 20 6c 69 6e | to `no.| lin|
|000019a0| 65 73 27 20 69 66 20 4e | 20 28 74 68 65 20 6e 75 |es' if N| (the nu|
|000019b0| 6d 62 65 72 20 6f 66 20 | 6c 69 6e 65 73 20 69 6e |mber of |lines in|
|000019c0| 20 74 68 65 20 67 72 6f | 75 70 20 69 6e 20 74 68 | the gro|up in th|
|000019d0| 65 20 74 68 65 20 6e 65 | 77 20 66 69 6c 65 29 0a |e the ne|w file).|
|000019e0| 20 20 20 20 20 69 73 20 | 30 2c 20 74 6f 20 60 31 | is |0, to `1|
|000019f0| 20 6c 69 6e 65 27 20 69 | 66 20 4e 20 69 73 20 31 | line' i|f N is 1|
|00001a00| 2c 20 61 6e 64 20 74 6f | 20 60 25 64 4e 20 6c 69 |, and to| `%dN li|
|00001a10| 6e 65 73 27 20 6f 74 68 | 65 72 77 69 73 65 2e 0a |nes' oth|erwise..|
|00001a20| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|00001a30| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 4c 69 6e 65 20 |fo, Nod|e: Line |
|00001a40| 46 6f 72 6d 61 74 73 2c | 20 20 4e 65 78 74 3a 20 |Formats,| Next: |
|00001a50| 44 65 74 61 69 6c 65 64 | 20 49 66 2d 74 68 65 6e |Detailed| If-then|
|00001a60| 2d 65 6c 73 65 2c 20 20 | 50 72 65 76 3a 20 4c 69 |-else, |Prev: Li|
|00001a70| 6e 65 20 47 72 6f 75 70 | 20 46 6f 72 6d 61 74 73 |ne Group| Formats|
|00001a80| 2c 20 20 55 70 3a 20 49 | 66 2d 74 68 65 6e 2d 65 |, Up: I|f-then-e|
|00001a90| 6c 73 65 0a 0a 4c 69 6e | 65 20 46 6f 72 6d 61 74 |lse..Lin|e Format|
|00001aa0| 73 0a 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 0a 0a |s.------|------..|
|00001ab0| 20 20 20 4c 69 6e 65 20 | 66 6f 72 6d 61 74 73 20 | Line |formats |
|00001ac0| 63 6f 6e 74 72 6f 6c 20 | 68 6f 77 20 65 61 63 68 |control |how each|
|00001ad0| 20 6c 69 6e 65 20 74 61 | 6b 65 6e 20 66 72 6f 6d | line ta|ken from|
|00001ae0| 20 61 6e 20 69 6e 70 75 | 74 20 66 69 6c 65 20 69 | an inpu|t file i|
|00001af0| 73 0a 6f 75 74 70 75 74 | 20 61 73 20 70 61 72 74 |s.output| as part|
|00001b00| 20 6f 66 20 61 20 6c 69 | 6e 65 20 67 72 6f 75 70 | of a li|ne group|
|00001b10| 20 69 6e 20 69 66 2d 74 | 68 65 6e 2d 65 6c 73 65 | in if-t|hen-else|
|00001b20| 20 66 6f 72 6d 61 74 2e | 0a 0a 20 20 20 46 6f 72 | format.|.. For|
|00001b30| 20 65 78 61 6d 70 6c 65 | 2c 20 74 68 65 20 66 6f | example|, the fo|
|00001b40| 6c 6c 6f 77 69 6e 67 20 | 63 6f 6d 6d 61 6e 64 20 |llowing |command |
|00001b50| 6f 75 74 70 75 74 73 20 | 74 65 78 74 20 77 69 74 |outputs |text wit|
|00001b60| 68 20 61 20 6f 6e 65 2d | 63 6f 6c 75 6d 6e 0a 63 |h a one-|column.c|
|00001b70| 68 61 6e 67 65 20 69 6e | 64 69 63 61 74 6f 72 20 |hange in|dicator |
|00001b80| 74 6f 20 74 68 65 20 6c | 65 66 74 20 6f 66 20 74 |to the l|eft of t|
|00001b90| 68 65 20 74 65 78 74 2e | 20 20 54 68 65 20 66 69 |he text.| The fi|
|00001ba0| 72 73 74 20 63 6f 6c 75 | 6d 6e 20 6f 66 20 6f 75 |rst colu|mn of ou|
|00001bb0| 74 70 75 74 0a 69 73 20 | 60 2d 27 20 66 6f 72 20 |tput.is |`-' for |
|00001bc0| 64 65 6c 65 74 65 64 20 | 6c 69 6e 65 73 2c 20 60 |deleted |lines, `|
|00001bd0| 7c 27 20 66 6f 72 20 61 | 64 64 65 64 20 6c 69 6e ||' for a|dded lin|
|00001be0| 65 73 2c 20 61 6e 64 20 | 61 20 73 70 61 63 65 20 |es, and |a space |
|00001bf0| 66 6f 72 0a 75 6e 63 68 | 61 6e 67 65 64 20 6c 69 |for.unch|anged li|
|00001c00| 6e 65 73 2e 20 20 54 68 | 65 20 66 6f 72 6d 61 74 |nes. Th|e format|
|00001c10| 73 20 63 6f 6e 74 61 69 | 6e 20 6e 65 77 6c 69 6e |s contai|n newlin|
|00001c20| 65 20 63 68 61 72 61 63 | 74 65 72 73 20 77 68 65 |e charac|ters whe|
|00001c30| 72 65 20 6e 65 77 6c 69 | 6e 65 73 0a 61 72 65 20 |re newli|nes.are |
|00001c40| 64 65 73 69 72 65 64 20 | 6f 6e 20 6f 75 74 70 75 |desired |on outpu|
|00001c50| 74 2e 0a 0a 20 20 20 20 | 20 64 69 66 66 20 5c 0a |t... | diff \.|
|00001c60| 20 20 20 20 20 20 20 20 | 2d 2d 6f 6c 64 2d 6c 69 | |--old-li|
|00001c70| 6e 65 2d 66 6f 72 6d 61 | 74 3d 27 2d 25 6c 0a 20 |ne-forma|t='-%l. |
|00001c80| 20 20 20 20 27 20 5c 0a | 20 20 20 20 20 20 20 20 | ' \.| |
|00001c90| 2d 2d 6e 65 77 2d 6c 69 | 6e 65 2d 66 6f 72 6d 61 |--new-li|ne-forma|
|00001ca0| 74 3d 27 7c 25 6c 0a 20 | 20 20 20 20 27 20 5c 0a |t='|%l. | ' \.|
|00001cb0| 20 20 20 20 20 20 20 20 | 2d 2d 75 6e 63 68 61 6e | |--unchan|
|00001cc0| 67 65 64 2d 6c 69 6e 65 | 2d 66 6f 72 6d 61 74 3d |ged-line|-format=|
|00001cd0| 27 20 25 6c 0a 20 20 20 | 20 20 27 20 5c 0a 20 20 |' %l. | ' \. |
|00001ce0| 20 20 20 20 20 20 6f 6c | 64 20 6e 65 77 0a 0a 20 | ol|d new.. |
|00001cf0| 20 20 54 6f 20 73 70 65 | 63 69 66 79 20 61 20 6c | To spe|cify a l|
|00001d00| 69 6e 65 20 66 6f 72 6d | 61 74 2c 20 75 73 65 20 |ine form|at, use |
|00001d10| 6f 6e 65 20 6f 66 20 74 | 68 65 20 66 6f 6c 6c 6f |one of t|he follo|
|00001d20| 77 69 6e 67 20 6f 70 74 | 69 6f 6e 73 2e 20 20 59 |wing opt|ions. Y|
|00001d30| 6f 75 0a 73 68 6f 75 6c | 64 20 71 75 6f 74 65 20 |ou.shoul|d quote |
|00001d40| 46 4f 52 4d 41 54 2c 20 | 73 69 6e 63 65 20 69 74 |FORMAT, |since it|
|00001d50| 20 6f 66 74 65 6e 20 63 | 6f 6e 74 61 69 6e 73 20 | often c|ontains |
|00001d60| 73 68 65 6c 6c 20 6d 65 | 74 61 63 68 61 72 61 63 |shell me|tacharac|
|00001d70| 74 65 72 73 2e 0a 0a 60 | 2d 2d 6f 6c 64 2d 6c 69 |ters...`|--old-li|
|00001d80| 6e 65 2d 66 6f 72 6d 61 | 74 3d 46 4f 52 4d 41 54 |ne-forma|t=FORMAT|
|00001d90| 27 0a 20 20 20 20 20 66 | 6f 72 6d 61 74 73 20 6c |'. f|ormats l|
|00001da0| 69 6e 65 73 20 6a 75 73 | 74 20 66 72 6f 6d 20 74 |ines jus|t from t|
|00001db0| 68 65 20 66 69 72 73 74 | 20 66 69 6c 65 2e 0a 0a |he first| file...|
|00001dc0| 60 2d 2d 6e 65 77 2d 6c | 69 6e 65 2d 66 6f 72 6d |`--new-l|ine-form|
|00001dd0| 61 74 3d 46 4f 52 4d 41 | 54 27 0a 20 20 20 20 20 |at=FORMA|T'. |
|00001de0| 66 6f 72 6d 61 74 73 20 | 6c 69 6e 65 73 20 6a 75 |formats |lines ju|
|00001df0| 73 74 20 66 72 6f 6d 20 | 74 68 65 20 73 65 63 6f |st from |the seco|
|00001e00| 6e 64 20 66 69 6c 65 2e | 0a 0a 60 2d 2d 75 6e 63 |nd file.|..`--unc|
|00001e10| 68 61 6e 67 65 64 2d 6c | 69 6e 65 2d 66 6f 72 6d |hanged-l|ine-form|
|00001e20| 61 74 3d 46 4f 52 4d 41 | 54 27 0a 20 20 20 20 20 |at=FORMA|T'. |
|00001e30| 66 6f 72 6d 61 74 73 20 | 6c 69 6e 65 73 20 63 6f |formats |lines co|
|00001e40| 6d 6d 6f 6e 20 74 6f 20 | 62 6f 74 68 20 66 69 6c |mmon to |both fil|
|00001e50| 65 73 2e 0a 0a 60 2d 2d | 6c 69 6e 65 2d 66 6f 72 |es...`--|line-for|
|00001e60| 6d 61 74 3d 46 4f 52 4d | 41 54 27 0a 20 20 20 20 |mat=FORM|AT'. |
|00001e70| 20 66 6f 72 6d 61 74 73 | 20 61 6c 6c 20 6c 69 6e | formats| all lin|
|00001e80| 65 73 3b 20 69 6e 20 65 | 66 66 65 63 74 2c 20 69 |es; in e|ffect, i|
|00001e90| 74 20 73 65 74 73 20 61 | 6c 6c 20 74 68 72 65 65 |t sets a|ll three|
|00001ea0| 20 61 62 6f 76 65 20 6f | 70 74 69 6f 6e 73 0a 20 | above o|ptions. |
|00001eb0| 20 20 20 20 73 69 6d 75 | 6c 74 61 6e 65 6f 75 73 | simu|ltaneous|
|00001ec0| 6c 79 2e 0a 0a 20 20 20 | 49 6e 20 61 20 6c 69 6e |ly... |In a lin|
|00001ed0| 65 20 66 6f 72 6d 61 74 | 2c 20 6f 72 64 69 6e 61 |e format|, ordina|
|00001ee0| 72 79 20 63 68 61 72 61 | 63 74 65 72 73 20 72 65 |ry chara|cters re|
|00001ef0| 70 72 65 73 65 6e 74 20 | 74 68 65 6d 73 65 6c 76 |present |themselv|
|00001f00| 65 73 3b 0a 63 6f 6e 76 | 65 72 73 69 6f 6e 20 73 |es;.conv|ersion s|
|00001f10| 70 65 63 69 66 69 63 61 | 74 69 6f 6e 73 20 73 74 |pecifica|tions st|
|00001f20| 61 72 74 20 77 69 74 68 | 20 60 25 27 20 61 6e 64 |art with| `%' and|
|00001f30| 20 68 61 76 65 20 6f 6e | 65 20 6f 66 20 74 68 65 | have on|e of the|
|00001f40| 20 66 6f 6c 6c 6f 77 69 | 6e 67 0a 66 6f 72 6d 73 | followi|ng.forms|
|00001f50| 2e 0a 0a 60 25 6c 27 0a | 20 20 20 20 20 73 74 61 |...`%l'.| sta|
|00001f60| 6e 64 73 20 66 6f 72 20 | 74 68 65 20 74 68 65 20 |nds for |the the |
|00001f70| 63 6f 6e 74 65 6e 74 73 | 20 6f 66 20 74 68 65 20 |contents| of the |
|00001f80| 6c 69 6e 65 2c 20 6e 6f | 74 20 63 6f 75 6e 74 69 |line, no|t counti|
|00001f90| 6e 67 20 69 74 73 20 74 | 72 61 69 6c 69 6e 67 0a |ng its t|railing.|
|00001fa0| 20 20 20 20 20 6e 65 77 | 6c 69 6e 65 20 28 69 66 | new|line (if|
|00001fb0| 20 61 6e 79 29 2e 20 20 | 54 68 69 73 20 66 6f 72 | any). |This for|
|00001fc0| 6d 61 74 20 69 67 6e 6f | 72 65 73 20 77 68 65 74 |mat igno|res whet|
|00001fd0| 68 65 72 20 74 68 65 20 | 6c 69 6e 65 20 69 73 0a |her the |line is.|
|00001fe0| 20 20 20 20 20 69 6e 63 | 6f 6d 70 6c 65 74 65 3b | inc|omplete;|
|00001ff0| 20 2a 4e 6f 74 65 20 49 | 6e 63 6f 6d 70 6c 65 74 | *Note I|ncomplet|
|00002000| 65 20 4c 69 6e 65 73 3a | 3a 2e 0a 0a 60 25 4c 27 |e Lines:|:...`%L'|
|00002010| 0a 20 20 20 20 20 73 74 | 61 6e 64 73 20 66 6f 72 |. st|ands for|
|00002020| 20 74 68 65 20 74 68 65 | 20 63 6f 6e 74 65 6e 74 | the the| content|
|00002030| 73 20 6f 66 20 74 68 65 | 20 6c 69 6e 65 2c 20 69 |s of the| line, i|
|00002040| 6e 63 6c 75 64 69 6e 67 | 20 69 74 73 20 74 72 61 |ncluding| its tra|
|00002050| 69 6c 69 6e 67 0a 20 20 | 20 20 20 6e 65 77 6c 69 |iling. | newli|
|00002060| 6e 65 20 28 69 66 20 61 | 6e 79 29 2e 20 20 49 66 |ne (if a|ny). If|
|00002070| 20 61 20 6c 69 6e 65 20 | 69 73 20 69 6e 63 6f 6d | a line |is incom|
|00002080| 70 6c 65 74 65 2c 20 74 | 68 69 73 20 66 6f 72 6d |plete, t|his form|
|00002090| 61 74 20 70 72 65 73 65 | 72 76 65 73 0a 20 20 20 |at prese|rves. |
|000020a0| 20 20 69 74 73 20 69 6e | 63 6f 6d 70 6c 65 74 65 | its in|complete|
|000020b0| 6e 65 73 73 2e 0a 0a 60 | 25 25 27 0a 20 20 20 20 |ness...`|%%'. |
|000020c0| 20 73 74 61 6e 64 73 20 | 66 6f 72 20 60 25 27 2e | stands |for `%'.|
|000020d0| 0a 0a 60 25 63 27 43 27 | 27 0a 20 20 20 20 20 77 |..`%c'C'|'. w|
|000020e0| 68 65 72 65 20 43 20 69 | 73 20 61 20 73 69 6e 67 |here C i|s a sing|
|000020f0| 6c 65 20 63 68 61 72 61 | 63 74 65 72 2c 20 73 74 |le chara|cter, st|
|00002100| 61 6e 64 73 20 66 6f 72 | 20 43 2e 20 20 43 20 6d |ands for| C. C m|
|00002110| 61 79 20 6e 6f 74 20 62 | 65 20 61 0a 20 20 20 20 |ay not b|e a. |
|00002120| 20 62 61 63 6b 73 6c 61 | 73 68 20 6f 72 20 61 6e | backsla|sh or an|
|00002130| 20 61 70 6f 73 74 72 6f | 70 68 65 2e 20 20 46 6f | apostro|phe. Fo|
|00002140| 72 20 65 78 61 6d 70 6c | 65 2c 20 60 25 63 27 3a |r exampl|e, `%c':|
|00002150| 27 27 20 73 74 61 6e 64 | 73 20 66 6f 72 20 61 0a |'' stand|s for a.|
|00002160| 20 20 20 20 20 63 6f 6c | 6f 6e 2e 0a 0a 60 25 63 | col|on...`%c|
|00002170| 27 5c 4f 27 27 0a 20 20 | 20 20 20 77 68 65 72 65 |'\O''. | where|
|00002180| 20 4f 20 69 73 20 61 20 | 73 74 72 69 6e 67 20 6f | O is a |string o|
|00002190| 66 20 31 2c 20 32 2c 20 | 6f 72 20 33 20 6f 63 74 |f 1, 2, |or 3 oct|
|000021a0| 61 6c 20 64 69 67 69 74 | 73 2c 20 73 74 61 6e 64 |al digit|s, stand|
|000021b0| 73 20 66 6f 72 20 74 68 | 65 0a 20 20 20 20 20 63 |s for th|e. c|
|000021c0| 68 61 72 61 63 74 65 72 | 20 77 69 74 68 20 6f 63 |haracter| with oc|
|000021d0| 74 61 6c 20 63 6f 64 65 | 20 4f 2e 20 20 46 6f 72 |tal code| O. For|
|000021e0| 20 65 78 61 6d 70 6c 65 | 2c 20 60 25 63 27 5c 30 | example|, `%c'\0|
|000021f0| 27 27 20 73 74 61 6e 64 | 73 20 66 6f 72 20 61 0a |'' stand|s for a.|
|00002200| 20 20 20 20 20 6e 75 6c | 6c 20 63 68 61 72 61 63 | nul|l charac|
|00002210| 74 65 72 2e 0a 0a 60 46 | 6e 27 0a 20 20 20 20 20 |ter...`F|n'. |
|00002220| 77 68 65 72 65 20 46 20 | 69 73 20 61 20 60 70 72 |where F |is a `pr|
|00002230| 69 6e 74 66 27 20 63 6f | 6e 76 65 72 73 69 6f 6e |intf' co|nversion|
|00002240| 20 73 70 65 63 69 66 69 | 63 61 74 69 6f 6e 2c 20 | specifi|cation, |
|00002250| 73 74 61 6e 64 73 20 66 | 6f 72 20 74 68 65 0a 20 |stands f|or the. |
|00002260| 20 20 20 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 20 | line| number |
|00002270| 66 6f 72 6d 61 74 74 65 | 64 20 77 69 74 68 20 46 |formatte|d with F|
|00002280| 2e 20 20 46 6f 72 20 65 | 78 61 6d 70 6c 65 2c 20 |. For e|xample, |
|00002290| 60 25 2e 35 64 6e 27 20 | 70 72 69 6e 74 73 20 74 |`%.5dn' |prints t|
|000022a0| 68 65 0a 20 20 20 20 20 | 6c 69 6e 65 20 6e 75 6d |he. |line num|
|000022b0| 62 65 72 20 75 73 69 6e | 67 20 74 68 65 20 60 70 |ber usin|g the `p|
|000022c0| 72 69 6e 74 66 27 20 66 | 6f 72 6d 61 74 20 60 22 |rintf' f|ormat `"|
|000022d0| 25 2e 35 64 22 27 2e 20 | 20 2a 4e 6f 74 65 20 4c |%.5d"'. | *Note L|
|000022e0| 69 6e 65 20 47 72 6f 75 | 70 0a 20 20 20 20 20 46 |ine Grou|p. F|
|000022f0| 6f 72 6d 61 74 73 3a 3a | 2c 20 66 6f 72 20 6d 6f |ormats::|, for mo|
|00002300| 72 65 20 61 62 6f 75 74 | 20 70 72 69 6e 74 66 20 |re about| printf |
|00002310| 63 6f 6e 76 65 72 73 69 | 6f 6e 20 73 70 65 63 69 |conversi|on speci|
|00002320| 66 69 63 61 74 69 6f 6e | 73 2e 0a 0a 20 20 20 54 |fication|s... T|
|00002330| 68 65 20 64 65 66 61 75 | 6c 74 20 6c 69 6e 65 20 |he defau|lt line |
|00002340| 66 6f 72 6d 61 74 20 69 | 73 20 60 25 6c 27 20 66 |format i|s `%l' f|
|00002350| 6f 6c 6c 6f 77 65 64 20 | 62 79 20 61 20 6e 65 77 |ollowed |by a new|
|00002360| 6c 69 6e 65 20 63 68 61 | 72 61 63 74 65 72 2e 0a |line cha|racter..|
|00002370| 0a 20 20 20 49 66 20 74 | 68 65 20 69 6e 70 75 74 |. If t|he input|
|00002380| 20 63 6f 6e 74 61 69 6e | 73 20 74 61 62 20 63 68 | contain|s tab ch|
|00002390| 61 72 61 63 74 65 72 73 | 20 61 6e 64 20 69 74 20 |aracters| and it |
|000023a0| 69 73 20 69 6d 70 6f 72 | 74 61 6e 74 20 74 68 61 |is impor|tant tha|
|000023b0| 74 20 74 68 65 79 0a 6c | 69 6e 65 20 75 70 20 6f |t they.l|ine up o|
|000023c0| 6e 20 6f 75 74 70 75 74 | 2c 20 79 6f 75 20 73 68 |n output|, you sh|
|000023d0| 6f 75 6c 64 20 65 6e 73 | 75 72 65 20 74 68 61 74 |ould ens|ure that|
|000023e0| 20 60 25 6c 27 20 6f 72 | 20 60 25 4c 27 20 69 6e | `%l' or| `%L' in|
|000023f0| 20 61 20 6c 69 6e 65 20 | 66 6f 72 6d 61 74 0a 69 | a line |format.i|
|00002400| 73 20 6a 75 73 74 20 61 | 66 74 65 72 20 61 20 74 |s just a|fter a t|
|00002410| 61 62 20 73 74 6f 70 20 | 28 65 2e 67 2e 20 62 79 |ab stop |(e.g. by|
|00002420| 20 70 72 65 63 65 64 69 | 6e 67 20 60 25 6c 27 20 | precedi|ng `%l' |
|00002430| 6f 72 20 60 25 4c 27 20 | 77 69 74 68 20 61 20 74 |or `%L' |with a t|
|00002440| 61 62 0a 63 68 61 72 61 | 63 74 65 72 29 2c 20 6f |ab.chara|cter), o|
|00002450| 72 20 79 6f 75 20 73 68 | 6f 75 6c 64 20 75 73 65 |r you sh|ould use|
|00002460| 20 74 68 65 20 60 2d 74 | 27 20 6f 72 20 60 2d 2d | the `-t|' or `--|
|00002470| 65 78 70 61 6e 64 2d 74 | 61 62 73 27 20 6f 70 74 |expand-t|abs' opt|
|00002480| 69 6f 6e 2e 0a 0a 20 20 | 20 54 61 6b 65 6e 20 74 |ion... | Taken t|
|00002490| 6f 67 65 74 68 65 72 2c | 20 74 68 65 20 6c 69 6e |ogether,| the lin|
|000024a0| 65 20 61 6e 64 20 6c 69 | 6e 65 20 67 72 6f 75 70 |e and li|ne group|
|000024b0| 20 66 6f 72 6d 61 74 73 | 20 6c 65 74 20 79 6f 75 | formats| let you|
|000024c0| 20 73 70 65 63 69 66 79 | 20 6d 61 6e 79 0a 64 69 | specify| many.di|
|000024d0| 66 66 65 72 65 6e 74 20 | 66 6f 72 6d 61 74 73 2e |fferent |formats.|
|000024e0| 20 20 46 6f 72 20 65 78 | 61 6d 70 6c 65 2c 20 74 | For ex|ample, t|
|000024f0| 68 65 20 66 6f 6c 6c 6f | 77 69 6e 67 20 63 6f 6d |he follo|wing com|
|00002500| 6d 61 6e 64 20 75 73 65 | 73 20 61 20 66 6f 72 6d |mand use|s a form|
|00002510| 61 74 0a 73 69 6d 69 6c | 61 72 20 74 6f 20 60 64 |at.simil|ar to `d|
|00002520| 69 66 66 27 27 73 20 6e | 6f 72 6d 61 6c 20 66 6f |iff''s n|ormal fo|
|00002530| 72 6d 61 74 2e 20 20 59 | 6f 75 20 63 61 6e 20 74 |rmat. Y|ou can t|
|00002540| 61 69 6c 6f 72 20 74 68 | 69 73 20 63 6f 6d 6d 61 |ailor th|is comma|
|00002550| 6e 64 20 74 6f 20 67 65 | 74 0a 66 69 6e 65 20 63 |nd to ge|t.fine c|
|00002560| 6f 6e 74 72 6f 6c 20 6f | 76 65 72 20 60 64 69 66 |ontrol o|ver `dif|
|00002570| 66 27 27 73 20 6f 75 74 | 70 75 74 2e 0a 0a 20 20 |f''s out|put... |
|00002580| 20 20 20 64 69 66 66 20 | 5c 0a 20 20 20 20 20 20 | diff |\. |
|00002590| 20 20 2d 2d 6f 6c 64 2d | 6c 69 6e 65 2d 66 6f 72 | --old-|line-for|
|000025a0| 6d 61 74 3d 27 3c 20 25 | 6c 0a 20 20 20 20 20 27 |mat='< %|l. '|
|000025b0| 20 5c 0a 20 20 20 20 20 | 20 20 20 2d 2d 6e 65 77 | \. | --new|
|000025c0| 2d 6c 69 6e 65 2d 66 6f | 72 6d 61 74 3d 27 3e 20 |-line-fo|rmat='> |
|000025d0| 25 6c 0a 20 20 20 20 20 | 27 20 5c 0a 20 20 20 20 |%l. |' \. |
|000025e0| 20 20 20 20 2d 2d 6f 6c | 64 2d 67 72 6f 75 70 2d | --ol|d-group-|
|000025f0| 66 6f 72 6d 61 74 3d 27 | 25 64 66 25 28 66 3d 6c |format='|%df%(f=l|
|00002600| 3f 3a 2c 25 64 6c 29 64 | 25 64 45 0a 20 20 20 20 |?:,%dl)d|%dE. |
|00002610| 20 25 3c 27 20 5c 0a 20 | 20 20 20 20 20 20 20 2d | %<' \. | -|
|00002620| 2d 6e 65 77 2d 67 72 6f | 75 70 2d 66 6f 72 6d 61 |-new-gro|up-forma|
|00002630| 74 3d 27 25 64 65 61 25 | 64 46 25 28 46 3d 4c 3f |t='%dea%|dF%(F=L?|
|00002640| 3a 2c 25 64 4c 29 0a 20 | 20 20 20 20 25 3e 27 20 |:,%dL). | %>' |
|00002650| 5c 0a 20 20 20 20 20 20 | 20 20 2d 2d 63 68 61 6e |\. | --chan|
|00002660| 67 65 64 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |ged-grou|p-format|
|00002670| 3d 27 25 64 66 25 28 66 | 3d 6c 3f 3a 2c 25 64 6c |='%df%(f|=l?:,%dl|
|00002680| 29 63 25 64 46 25 28 46 | 3d 4c 3f 3a 2c 25 64 4c |)c%dF%(F|=L?:,%dL|
|00002690| 29 0a 20 20 20 20 20 25 | 3c 2d 2d 2d 0a 20 20 20 |). %|<---. |
|000026a0| 20 20 25 3e 27 20 5c 0a | 20 20 20 20 20 20 20 20 | %>' \.| |
|000026b0| 2d 2d 75 6e 63 68 61 6e | 67 65 64 2d 67 72 6f 75 |--unchan|ged-grou|
|000026c0| 70 2d 66 6f 72 6d 61 74 | 3d 27 27 20 5c 0a 20 20 |p-format|='' \. |
|000026d0| 20 20 20 20 20 20 6f 6c | 64 20 6e 65 77 0a 0a 1f | ol|d new...|
|000026e0| 0a 46 69 6c 65 3a 20 64 | 69 66 66 2e 69 6e 66 6f |.File: d|iff.info|
|000026f0| 2c 20 20 4e 6f 64 65 3a | 20 44 65 74 61 69 6c 65 |, Node:| Detaile|
|00002700| 64 20 49 66 2d 74 68 65 | 6e 2d 65 6c 73 65 2c 20 |d If-the|n-else, |
|00002710| 20 4e 65 78 74 3a 20 45 | 78 61 6d 70 6c 65 20 49 | Next: E|xample I|
|00002720| 66 2d 74 68 65 6e 2d 65 | 6c 73 65 2c 20 20 50 72 |f-then-e|lse, Pr|
|00002730| 65 76 3a 20 4c 69 6e 65 | 20 46 6f 72 6d 61 74 73 |ev: Line| Formats|
|00002740| 2c 20 20 55 70 3a 20 49 | 66 2d 74 68 65 6e 2d 65 |, Up: I|f-then-e|
|00002750| 6c 73 65 0a 0a 44 65 74 | 61 69 6c 65 64 20 44 65 |lse..Det|ailed De|
|00002760| 73 63 72 69 70 74 69 6f | 6e 20 6f 66 20 49 66 2d |scriptio|n of If-|
|00002770| 74 68 65 6e 2d 65 6c 73 | 65 20 46 6f 72 6d 61 74 |then-els|e Format|
|00002780| 0a 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |.-------|--------|
|00002790| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000027a0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 0a 0a 20 20 |--------|----.. |
|000027b0| 20 46 6f 72 20 6c 69 6e | 65 73 20 63 6f 6d 6d 6f | For lin|es commo|
|000027c0| 6e 20 74 6f 20 62 6f 74 | 68 20 66 69 6c 65 73 2c |n to bot|h files,|
|000027d0| 20 60 64 69 66 66 27 20 | 75 73 65 73 20 74 68 65 | `diff' |uses the|
|000027e0| 20 75 6e 63 68 61 6e 67 | 65 64 20 6c 69 6e 65 20 | unchang|ed line |
|000027f0| 67 72 6f 75 70 0a 66 6f | 72 6d 61 74 2e 20 20 46 |group.fo|rmat. F|
|00002800| 6f 72 20 65 61 63 68 20 | 68 75 6e 6b 20 6f 66 20 |or each |hunk of |
|00002810| 64 69 66 66 65 72 65 6e | 63 65 73 20 69 6e 20 74 |differen|ces in t|
|00002820| 68 65 20 6d 65 72 67 65 | 64 20 6f 75 74 70 75 74 |he merge|d output|
|00002830| 20 66 6f 72 6d 61 74 2c | 20 69 66 0a 74 68 65 20 | format,| if.the |
|00002840| 68 75 6e 6b 20 63 6f 6e | 74 61 69 6e 73 20 6f 6e |hunk con|tains on|
|00002850| 6c 79 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 74 68 |ly lines| from th|
|00002860| 65 20 66 69 72 73 74 20 | 66 69 6c 65 2c 20 60 64 |e first |file, `d|
|00002870| 69 66 66 27 20 75 73 65 | 73 20 74 68 65 20 6f 6c |iff' use|s the ol|
|00002880| 64 0a 6c 69 6e 65 20 67 | 72 6f 75 70 20 66 6f 72 |d.line g|roup for|
|00002890| 6d 61 74 3b 20 69 66 20 | 74 68 65 20 68 75 6e 6b |mat; if |the hunk|
|000028a0| 20 63 6f 6e 74 61 69 6e | 73 20 6f 6e 6c 79 20 6c | contain|s only l|
|000028b0| 69 6e 65 73 20 66 72 6f | 6d 20 74 68 65 20 73 65 |ines fro|m the se|
|000028c0| 63 6f 6e 64 0a 66 69 6c | 65 2c 20 60 64 69 66 66 |cond.fil|e, `diff|
|000028d0| 27 20 75 73 65 73 20 74 | 68 65 20 6e 65 77 20 67 |' uses t|he new g|
|000028e0| 72 6f 75 70 20 66 6f 72 | 6d 61 74 3b 20 6f 74 68 |roup for|mat; oth|
|000028f0| 65 72 77 69 73 65 2c 20 | 60 64 69 66 66 27 20 75 |erwise, |`diff' u|
|00002900| 73 65 73 20 74 68 65 0a | 63 68 61 6e 67 65 64 20 |ses the.|changed |
|00002910| 67 72 6f 75 70 20 66 6f | 72 6d 61 74 2e 0a 0a 20 |group fo|rmat... |
|00002920| 20 20 54 68 65 20 6f 6c | 64 2c 20 6e 65 77 2c 20 | The ol|d, new, |
|00002930| 61 6e 64 20 75 6e 63 68 | 61 6e 67 65 64 20 6c 69 |and unch|anged li|
|00002940| 6e 65 20 66 6f 72 6d 61 | 74 73 20 73 70 65 63 69 |ne forma|ts speci|
|00002950| 66 79 20 74 68 65 20 6f | 75 74 70 75 74 20 66 6f |fy the o|utput fo|
|00002960| 72 6d 61 74 20 6f 66 0a | 6c 69 6e 65 73 20 66 72 |rmat of.|lines fr|
|00002970| 6f 6d 20 74 68 65 20 66 | 69 72 73 74 20 66 69 6c |om the f|irst fil|
|00002980| 65 2c 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 74 68 |e, lines| from th|
|00002990| 65 20 73 65 63 6f 6e 64 | 20 66 69 6c 65 2c 20 61 |e second| file, a|
|000029a0| 6e 64 20 6c 69 6e 65 73 | 20 63 6f 6d 6d 6f 6e 0a |nd lines| common.|
|000029b0| 74 6f 20 62 6f 74 68 20 | 66 69 6c 65 73 2c 20 72 |to both |files, r|
|000029c0| 65 73 70 65 63 74 69 76 | 65 6c 79 2e 0a 0a 20 20 |espectiv|ely... |
|000029d0| 20 54 68 65 20 6f 70 74 | 69 6f 6e 20 60 2d 2d 69 | The opt|ion `--i|
|000029e0| 66 64 65 66 3d 4e 41 4d | 45 27 20 69 73 20 65 71 |fdef=NAM|E' is eq|
|000029f0| 75 69 76 61 6c 65 6e 74 | 20 74 6f 20 74 68 65 20 |uivalent| to the |
|00002a00| 66 6f 6c 6c 6f 77 69 6e | 67 20 73 65 71 75 65 6e |followin|g sequen|
|00002a10| 63 65 20 6f 66 0a 6f 70 | 74 69 6f 6e 73 20 75 73 |ce of.op|tions us|
|00002a20| 69 6e 67 20 73 68 65 6c | 6c 20 73 79 6e 74 61 78 |ing shel|l syntax|
|00002a30| 3a 0a 0a 20 20 20 20 20 | 2d 2d 6f 6c 64 2d 67 72 |:.. |--old-gr|
|00002a40| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 23 69 66 6e |oup-form|at='#ifn|
|00002a50| 64 65 66 20 4e 41 4d 45 | 0a 20 20 20 20 20 25 3c |def NAME|. %<|
|00002a60| 23 65 6e 64 69 66 20 2f | 2a 20 6e 6f 74 20 4e 41 |#endif /|* not NA|
|00002a70| 4d 45 20 2a 2f 0a 20 20 | 20 20 20 27 20 5c 0a 20 |ME */. | ' \. |
|00002a80| 20 20 20 20 2d 2d 6e 65 | 77 2d 67 72 6f 75 70 2d | --ne|w-group-|
|00002a90| 66 6f 72 6d 61 74 3d 27 | 23 69 66 64 65 66 20 4e |format='|#ifdef N|
|00002aa0| 41 4d 45 0a 20 20 20 20 | 20 25 3e 23 65 6e 64 69 |AME. | %>#endi|
|00002ab0| 66 20 2f 2a 20 4e 41 4d | 45 20 2a 2f 0a 20 20 20 |f /* NAM|E */. |
|00002ac0| 20 20 27 20 5c 0a 20 20 | 20 20 20 2d 2d 75 6e 63 | ' \. | --unc|
|00002ad0| 68 61 6e 67 65 64 2d 67 | 72 6f 75 70 2d 66 6f 72 |hanged-g|roup-for|
|00002ae0| 6d 61 74 3d 27 25 3d 27 | 20 5c 0a 20 20 20 20 20 |mat='%='| \. |
|00002af0| 2d 2d 63 68 61 6e 67 65 | 64 2d 67 72 6f 75 70 2d |--change|d-group-|
|00002b00| 66 6f 72 6d 61 74 3d 27 | 23 69 66 6e 64 65 66 20 |format='|#ifndef |
|00002b10| 4e 41 4d 45 0a 20 20 20 | 20 20 25 3c 23 65 6c 73 |NAME. | %<#els|
|00002b20| 65 20 2f 2a 20 4e 41 4d | 45 20 2a 2f 0a 20 20 20 |e /* NAM|E */. |
|00002b30| 20 20 25 3e 23 65 6e 64 | 69 66 20 2f 2a 20 4e 41 | %>#end|if /* NA|
|00002b40| 4d 45 20 2a 2f 0a 20 20 | 20 20 20 27 0a 0a 20 20 |ME */. | '.. |
|00002b50| 20 59 6f 75 20 73 68 6f | 75 6c 64 20 63 61 72 65 | You sho|uld care|
|00002b60| 66 75 6c 6c 79 20 63 68 | 65 63 6b 20 74 68 65 20 |fully ch|eck the |
|00002b70| 60 64 69 66 66 27 20 6f | 75 74 70 75 74 20 66 6f |`diff' o|utput fo|
|00002b80| 72 20 70 72 6f 70 65 72 | 20 6e 65 73 74 69 6e 67 |r proper| nesting|
|00002b90| 2e 0a 46 6f 72 20 65 78 | 61 6d 70 6c 65 2c 20 77 |..For ex|ample, w|
|00002ba0| 68 65 6e 20 75 73 69 6e | 67 20 74 68 65 20 74 68 |hen usin|g the th|
|00002bb0| 65 20 60 2d 44 20 4e 41 | 4d 45 27 20 6f 72 20 60 |e `-D NA|ME' or `|
|00002bc0| 2d 2d 69 66 64 65 66 3d | 4e 41 4d 45 27 20 6f 70 |--ifdef=|NAME' op|
|00002bd0| 74 69 6f 6e 2c 20 79 6f | 75 0a 73 68 6f 75 6c 64 |tion, yo|u.should|
|00002be0| 20 63 68 65 63 6b 20 74 | 68 61 74 20 69 66 20 74 | check t|hat if t|
|00002bf0| 68 65 20 64 69 66 66 65 | 72 69 6e 67 20 6c 69 6e |he diffe|ring lin|
|00002c00| 65 73 20 63 6f 6e 74 61 | 69 6e 20 61 6e 79 20 6f |es conta|in any o|
|00002c10| 66 20 74 68 65 20 43 0a | 70 72 65 70 72 6f 63 65 |f the C.|preproce|
|00002c20| 73 73 6f 72 20 64 69 72 | 65 63 74 69 76 65 73 20 |ssor dir|ectives |
|00002c30| 60 23 69 66 64 65 66 27 | 2c 20 60 23 69 66 6e 64 |`#ifdef'|, `#ifnd|
|00002c40| 65 66 27 2c 20 60 23 65 | 6c 73 65 27 2c 20 60 23 |ef', `#e|lse', `#|
|00002c50| 65 6c 69 66 27 2c 20 6f | 72 0a 60 23 65 6e 64 69 |elif', o|r.`#endi|
|00002c60| 66 27 2c 20 74 68 65 79 | 20 61 72 65 20 6e 65 73 |f', they| are nes|
|00002c70| 74 65 64 20 70 72 6f 70 | 65 72 6c 79 20 61 6e 64 |ted prop|erly and|
|00002c80| 20 6d 61 74 63 68 2e 20 | 20 49 66 20 74 68 65 79 | match. | If they|
|00002c90| 20 64 6f 6e 27 74 2c 20 | 79 6f 75 20 6d 75 73 74 | don't, |you must|
|00002ca0| 0a 6d 61 6b 65 20 63 6f | 72 72 65 63 74 69 6f 6e |.make co|rrection|
|00002cb0| 73 20 6d 61 6e 75 61 6c | 6c 79 2e 20 20 49 74 20 |s manual|ly. It |
|00002cc0| 69 73 20 61 20 67 6f 6f | 64 20 69 64 65 61 20 74 |is a goo|d idea t|
|00002cd0| 6f 20 63 61 72 65 66 75 | 6c 6c 79 20 63 68 65 63 |o carefu|lly chec|
|00002ce0| 6b 20 74 68 65 0a 72 65 | 73 75 6c 74 69 6e 67 20 |k the.re|sulting |
|00002cf0| 63 6f 64 65 20 61 6e 79 | 77 61 79 20 74 6f 20 6d |code any|way to m|
|00002d00| 61 6b 65 20 73 75 72 65 | 20 74 68 61 74 20 69 74 |ake sure| that it|
|00002d10| 20 72 65 61 6c 6c 79 20 | 64 6f 65 73 20 77 68 61 | really |does wha|
|00002d20| 74 20 79 6f 75 20 77 61 | 6e 74 20 69 74 0a 74 6f |t you wa|nt it.to|
|00002d30| 3b 20 64 65 70 65 6e 64 | 69 6e 67 20 6f 6e 20 68 |; depend|ing on h|
|00002d40| 6f 77 20 74 68 65 20 69 | 6e 70 75 74 20 66 69 6c |ow the i|nput fil|
|00002d50| 65 73 20 77 65 72 65 20 | 70 72 6f 64 75 63 65 64 |es were |produced|
|00002d60| 2c 20 74 68 65 20 6f 75 | 74 70 75 74 20 6d 69 67 |, the ou|tput mig|
|00002d70| 68 74 0a 63 6f 6e 74 61 | 69 6e 20 64 75 70 6c 69 |ht.conta|in dupli|
|00002d80| 63 61 74 65 20 6f 72 20 | 6f 74 68 65 72 77 69 73 |cate or |otherwis|
|00002d90| 65 20 69 6e 63 6f 72 72 | 65 63 74 20 63 6f 64 65 |e incorr|ect code|
|00002da0| 2e 0a 0a 20 20 20 54 68 | 65 20 60 70 61 74 63 68 |... Th|e `patch|
|00002db0| 27 20 60 2d 44 20 4e 41 | 4d 45 27 20 6f 70 74 69 |' `-D NA|ME' opti|
|00002dc0| 6f 6e 20 62 65 68 61 76 | 65 73 20 6a 75 73 74 20 |on behav|es just |
|00002dd0| 6c 69 6b 65 20 74 68 65 | 20 60 64 69 66 66 27 20 |like the| `diff' |
|00002de0| 60 2d 44 20 4e 41 4d 45 | 27 0a 6f 70 74 69 6f 6e |`-D NAME|'.option|
|00002df0| 2c 20 65 78 63 65 70 74 | 20 69 74 20 6f 70 65 72 |, except| it oper|
|00002e00| 61 74 65 73 20 6f 6e 20 | 61 20 66 69 6c 65 20 61 |ates on |a file a|
|00002e10| 6e 64 20 61 20 64 69 66 | 66 20 74 6f 20 70 72 6f |nd a dif|f to pro|
|00002e20| 64 75 63 65 20 61 20 6d | 65 72 67 65 64 0a 66 69 |duce a m|erged.fi|
|00002e30| 6c 65 3b 20 2a 4e 6f 74 | 65 20 70 61 74 63 68 20 |le; *Not|e patch |
|00002e40| 4f 70 74 69 6f 6e 73 3a | 3a 2e 0a 0a 1f 0a 46 69 |Options:|:.....Fi|
|00002e50| 6c 65 3a 20 64 69 66 66 | 2e 69 6e 66 6f 2c 20 20 |le: diff|.info, |
|00002e60| 4e 6f 64 65 3a 20 45 78 | 61 6d 70 6c 65 20 49 66 |Node: Ex|ample If|
|00002e70| 2d 74 68 65 6e 2d 65 6c | 73 65 2c 20 20 50 72 65 |-then-el|se, Pre|
|00002e80| 76 3a 20 44 65 74 61 69 | 6c 65 64 20 49 66 2d 74 |v: Detai|led If-t|
|00002e90| 68 65 6e 2d 65 6c 73 65 | 2c 20 20 55 70 3a 20 49 |hen-else|, Up: I|
|00002ea0| 66 2d 74 68 65 6e 2d 65 | 6c 73 65 0a 0a 41 6e 20 |f-then-e|lse..An |
|00002eb0| 45 78 61 6d 70 6c 65 20 | 6f 66 20 49 66 2d 74 68 |Example |of If-th|
|00002ec0| 65 6e 2d 65 6c 73 65 20 | 46 6f 72 6d 61 74 0a 2d |en-else |Format.-|
|00002ed0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002ee0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002ef0| 0a 0a 20 20 20 48 65 72 | 65 20 69 73 20 74 68 65 |.. Her|e is the|
|00002f00| 20 6f 75 74 70 75 74 20 | 6f 66 20 60 64 69 66 66 | output |of `diff|
|00002f10| 20 2d 44 54 57 4f 20 6c | 61 6f 20 74 7a 75 27 20 | -DTWO l|ao tzu' |
|00002f20| 28 2a 6e 6f 74 65 20 53 | 61 6d 70 6c 65 20 64 69 |(*note S|ample di|
|00002f30| 66 66 0a 49 6e 70 75 74 | 3a 3a 2e 2c 20 66 6f 72 |ff.Input|::., for|
|00002f40| 20 74 68 65 20 63 6f 6d | 70 6c 65 74 65 20 63 6f | the com|plete co|
|00002f50| 6e 74 65 6e 74 73 20 6f | 66 20 74 68 65 20 74 77 |ntents o|f the tw|
|00002f60| 6f 20 66 69 6c 65 73 29 | 3a 0a 0a 20 20 20 20 20 |o files)|:.. |
|00002f70| 23 69 66 6e 64 65 66 20 | 54 57 4f 0a 20 20 20 20 |#ifndef |TWO. |
|00002f80| 20 54 68 65 20 57 61 79 | 20 74 68 61 74 20 63 61 | The Way| that ca|
|00002f90| 6e 20 62 65 20 74 6f 6c | 64 20 6f 66 20 69 73 20 |n be tol|d of is |
|00002fa0| 6e 6f 74 20 74 68 65 20 | 65 74 65 72 6e 61 6c 20 |not the |eternal |
|00002fb0| 57 61 79 3b 0a 20 20 20 | 20 20 54 68 65 20 6e 61 |Way;. | The na|
|00002fc0| 6d 65 20 74 68 61 74 20 | 63 61 6e 20 62 65 20 6e |me that |can be n|
|00002fd0| 61 6d 65 64 20 69 73 20 | 6e 6f 74 20 74 68 65 20 |amed is |not the |
|00002fe0| 65 74 65 72 6e 61 6c 20 | 6e 61 6d 65 2e 0a 20 20 |eternal |name.. |
|00002ff0| 20 20 20 23 65 6e 64 69 | 66 20 2f 2a 20 6e 6f 74 | #endi|f /* not|
|00003000| 20 54 57 4f 20 2a 2f 0a | 20 20 20 20 20 54 68 65 | TWO */.| The|
|00003010| 20 4e 61 6d 65 6c 65 73 | 73 20 69 73 20 74 68 65 | Nameles|s is the|
|00003020| 20 6f 72 69 67 69 6e 20 | 6f 66 20 48 65 61 76 65 | origin |of Heave|
|00003030| 6e 20 61 6e 64 20 45 61 | 72 74 68 3b 0a 20 20 20 |n and Ea|rth;. |
|00003040| 20 20 23 69 66 6e 64 65 | 66 20 54 57 4f 0a 20 20 | #ifnde|f TWO. |
|00003050| 20 20 20 54 68 65 20 4e | 61 6d 65 64 20 69 73 20 | The N|amed is |
|00003060| 74 68 65 20 6d 6f 74 68 | 65 72 20 6f 66 20 61 6c |the moth|er of al|
|00003070| 6c 20 74 68 69 6e 67 73 | 2e 0a 20 20 20 20 20 23 |l things|.. #|
|00003080| 65 6c 73 65 20 2f 2a 20 | 54 57 4f 20 2a 2f 0a 20 |else /* |TWO */. |
|00003090| 20 20 20 20 54 68 65 20 | 6e 61 6d 65 64 20 69 73 | The |named is|
|000030a0| 20 74 68 65 20 6d 6f 74 | 68 65 72 20 6f 66 20 61 | the mot|her of a|
|000030b0| 6c 6c 20 74 68 69 6e 67 | 73 2e 0a 20 20 20 20 20 |ll thing|s.. |
|000030c0| 0a 20 20 20 20 20 23 65 | 6e 64 69 66 20 2f 2a 20 |. #e|ndif /* |
|000030d0| 54 57 4f 20 2a 2f 0a 20 | 20 20 20 20 54 68 65 72 |TWO */. | Ther|
|000030e0| 65 66 6f 72 65 20 6c 65 | 74 20 74 68 65 72 65 20 |efore le|t there |
|000030f0| 61 6c 77 61 79 73 20 62 | 65 20 6e 6f 6e 2d 62 65 |always b|e non-be|
|00003100| 69 6e 67 2c 0a 20 20 20 | 20 20 20 20 73 6f 20 77 |ing,. | so w|
|00003110| 65 20 6d 61 79 20 73 65 | 65 20 74 68 65 69 72 20 |e may se|e their |
|00003120| 73 75 62 74 6c 65 74 79 | 2c 0a 20 20 20 20 20 41 |subtlety|,. A|
|00003130| 6e 64 20 6c 65 74 20 74 | 68 65 72 65 20 61 6c 77 |nd let t|here alw|
|00003140| 61 79 73 20 62 65 20 62 | 65 69 6e 67 2c 0a 20 20 |ays be b|eing,. |
|00003150| 20 20 20 20 20 73 6f 20 | 77 65 20 6d 61 79 20 73 | so |we may s|
|00003160| 65 65 20 74 68 65 69 72 | 20 6f 75 74 63 6f 6d 65 |ee their| outcome|
|00003170| 2e 0a 20 20 20 20 20 54 | 68 65 20 74 77 6f 20 61 |.. T|he two a|
|00003180| 72 65 20 74 68 65 20 73 | 61 6d 65 2c 0a 20 20 20 |re the s|ame,. |
|00003190| 20 20 42 75 74 20 61 66 | 74 65 72 20 74 68 65 79 | But af|ter they|
|000031a0| 20 61 72 65 20 70 72 6f | 64 75 63 65 64 2c 0a 20 | are pro|duced,. |
|000031b0| 20 20 20 20 20 20 74 68 | 65 79 20 68 61 76 65 20 | th|ey have |
|000031c0| 64 69 66 66 65 72 65 6e | 74 20 6e 61 6d 65 73 2e |differen|t names.|
|000031d0| 0a 20 20 20 20 20 23 69 | 66 64 65 66 20 54 57 4f |. #i|fdef TWO|
|000031e0| 0a 20 20 20 20 20 54 68 | 65 79 20 62 6f 74 68 20 |. Th|ey both |
|000031f0| 6d 61 79 20 62 65 20 63 | 61 6c 6c 65 64 20 64 65 |may be c|alled de|
|00003200| 65 70 20 61 6e 64 20 70 | 72 6f 66 6f 75 6e 64 2e |ep and p|rofound.|
|00003210| 0a 20 20 20 20 20 44 65 | 65 70 65 72 20 61 6e 64 |. De|eper and|
|00003220| 20 6d 6f 72 65 20 70 72 | 6f 66 6f 75 6e 64 2c 0a | more pr|ofound,.|
|00003230| 20 20 20 20 20 54 68 65 | 20 64 6f 6f 72 20 6f 66 | The| door of|
|00003240| 20 61 6c 6c 20 73 75 62 | 74 6c 65 74 69 65 73 21 | all sub|tleties!|
|00003250| 0a 20 20 20 20 20 23 65 | 6e 64 69 66 20 2f 2a 20 |. #e|ndif /* |
|00003260| 54 57 4f 20 2a 2f 0a 0a | 1f 0a 46 69 6c 65 3a 20 |TWO */..|..File: |
|00003270| 64 69 66 66 2e 69 6e 66 | 6f 2c 20 20 4e 6f 64 65 |diff.inf|o, Node|
|00003280| 3a 20 43 6f 6d 70 61 72 | 69 6e 67 20 44 69 72 65 |: Compar|ing Dire|
|00003290| 63 74 6f 72 69 65 73 2c | 20 20 4e 65 78 74 3a 20 |ctories,| Next: |
|000032a0| 41 64 6a 75 73 74 69 6e | 67 20 4f 75 74 70 75 74 |Adjustin|g Output|
|000032b0| 2c 20 20 50 72 65 76 3a | 20 4f 75 74 70 75 74 20 |, Prev:| Output |
|000032c0| 46 6f 72 6d 61 74 73 2c | 20 20 55 70 3a 20 54 6f |Formats,| Up: To|
|000032d0| 70 0a 0a 43 6f 6d 70 61 | 72 69 6e 67 20 44 69 72 |p..Compa|ring Dir|
|000032e0| 65 63 74 6f 72 69 65 73 | 0a 2a 2a 2a 2a 2a 2a 2a |ectories|.*******|
|000032f0| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 0a 0a |********|******..|
|00003300| 20 20 20 59 6f 75 20 63 | 61 6e 20 75 73 65 20 60 | You c|an use `|
|00003310| 64 69 66 66 27 20 74 6f | 20 63 6f 6d 70 61 72 65 |diff' to| compare|
|00003320| 20 73 6f 6d 65 20 6f 72 | 20 61 6c 6c 20 6f 66 20 | some or| all of |
|00003330| 74 68 65 20 66 69 6c 65 | 73 20 69 6e 20 74 77 6f |the file|s in two|
|00003340| 0a 64 69 72 65 63 74 6f | 72 79 20 74 72 65 65 73 |.directo|ry trees|
|00003350| 2e 20 20 57 68 65 6e 20 | 62 6f 74 68 20 66 69 6c |. When |both fil|
|00003360| 65 20 6e 61 6d 65 20 61 | 72 67 75 6d 65 6e 74 73 |e name a|rguments|
|00003370| 20 74 6f 20 60 64 69 66 | 66 27 20 61 72 65 0a 64 | to `dif|f' are.d|
|00003380| 69 72 65 63 74 6f 72 69 | 65 73 2c 20 69 74 20 63 |irectori|es, it c|
|00003390| 6f 6d 70 61 72 65 73 20 | 65 61 63 68 20 66 69 6c |ompares |each fil|
|000033a0| 65 20 74 68 61 74 20 69 | 73 20 63 6f 6e 74 61 69 |e that i|s contai|
|000033b0| 6e 65 64 20 69 6e 20 62 | 6f 74 68 0a 64 69 72 65 |ned in b|oth.dire|
|000033c0| 63 74 6f 72 69 65 73 2c | 20 65 78 61 6d 69 6e 69 |ctories,| examini|
|000033d0| 6e 67 20 66 69 6c 65 20 | 6e 61 6d 65 73 20 69 6e |ng file |names in|
|000033e0| 20 61 6c 70 68 61 62 65 | 74 69 63 61 6c 20 6f 72 | alphabe|tical or|
|000033f0| 64 65 72 2e 20 20 4e 6f | 72 6d 61 6c 6c 79 0a 60 |der. No|rmally.`|
|00003400| 64 69 66 66 27 20 69 73 | 20 73 69 6c 65 6e 74 20 |diff' is| silent |
|00003410| 61 62 6f 75 74 20 70 61 | 69 72 73 20 6f 66 20 66 |about pa|irs of f|
|00003420| 69 6c 65 73 20 74 68 61 | 74 20 63 6f 6e 74 61 69 |iles tha|t contai|
|00003430| 6e 20 6e 6f 20 64 69 66 | 66 65 72 65 6e 63 65 73 |n no dif|ferences|
|00003440| 2c 20 62 75 74 0a 69 66 | 20 79 6f 75 20 75 73 65 |, but.if| you use|
|00003450| 20 74 68 65 20 60 2d 73 | 27 20 6f 72 20 60 2d 2d | the `-s|' or `--|
|00003460| 72 65 70 6f 72 74 2d 69 | 64 65 6e 74 69 63 61 6c |report-i|dentical|
|00003470| 2d 66 69 6c 65 73 27 20 | 6f 70 74 69 6f 6e 2c 20 |-files' |option, |
|00003480| 69 74 20 72 65 70 6f 72 | 74 73 0a 70 61 69 72 73 |it repor|ts.pairs|
|00003490| 20 6f 66 20 69 64 65 6e | 74 69 63 61 6c 20 66 69 | of iden|tical fi|
|000034a0| 6c 65 73 2e 20 20 4e 6f | 72 6d 61 6c 6c 79 20 60 |les. No|rmally `|
|000034b0| 64 69 66 66 27 20 72 65 | 70 6f 72 74 73 20 73 75 |diff' re|ports su|
|000034c0| 62 64 69 72 65 63 74 6f | 72 69 65 73 0a 63 6f 6d |bdirecto|ries.com|
|000034d0| 6d 6f 6e 20 74 6f 20 62 | 6f 74 68 20 64 69 72 65 |mon to b|oth dire|
|000034e0| 63 74 6f 72 69 65 73 20 | 77 69 74 68 6f 75 74 20 |ctories |without |
|000034f0| 63 6f 6d 70 61 72 69 6e | 67 20 73 75 62 64 69 72 |comparin|g subdir|
|00003500| 65 63 74 6f 72 69 65 73 | 27 20 66 69 6c 65 73 2c |ectories|' files,|
|00003510| 20 62 75 74 0a 69 66 20 | 79 6f 75 20 75 73 65 20 | but.if |you use |
|00003520| 74 68 65 20 60 2d 72 27 | 20 6f 72 20 60 2d 2d 72 |the `-r'| or `--r|
|00003530| 65 63 75 72 73 69 76 65 | 27 20 6f 70 74 69 6f 6e |ecursive|' option|
|00003540| 2c 20 69 74 20 63 6f 6d | 70 61 72 65 73 20 65 76 |, it com|pares ev|
|00003550| 65 72 79 0a 63 6f 72 72 | 65 73 70 6f 6e 64 69 6e |ery.corr|espondin|
|00003560| 67 20 70 61 69 72 20 6f | 66 20 66 69 6c 65 73 20 |g pair o|f files |
|00003570| 69 6e 20 74 68 65 20 64 | 69 72 65 63 74 6f 72 79 |in the d|irectory|
|00003580| 20 74 72 65 65 73 2c 20 | 61 73 20 6d 61 6e 79 20 | trees, |as many |
|00003590| 6c 65 76 65 6c 73 20 64 | 65 65 70 0a 61 73 20 74 |levels d|eep.as t|
|000035a0| 68 65 79 20 67 6f 2e 0a | 0a 20 20 20 46 6f 72 20 |hey go..|. For |
|000035b0| 66 69 6c 65 20 6e 61 6d | 65 73 20 74 68 61 74 20 |file nam|es that |
|000035c0| 61 72 65 20 69 6e 20 6f | 6e 6c 79 20 6f 6e 65 20 |are in o|nly one |
|000035d0| 6f 66 20 74 68 65 20 64 | 69 72 65 63 74 6f 72 69 |of the d|irectori|
|000035e0| 65 73 2c 20 60 64 69 66 | 66 27 0a 6e 6f 72 6d 61 |es, `dif|f'.norma|
|000035f0| 6c 6c 79 20 64 6f 65 73 | 20 6e 6f 74 20 73 68 6f |lly does| not sho|
|00003600| 77 20 74 68 65 20 63 6f | 6e 74 65 6e 74 73 20 6f |w the co|ntents o|
|00003610| 66 20 74 68 65 20 66 69 | 6c 65 20 74 68 61 74 20 |f the fi|le that |
|00003620| 65 78 69 73 74 73 3b 20 | 69 74 20 72 65 70 6f 72 |exists; |it repor|
|00003630| 74 73 0a 6f 6e 6c 79 20 | 74 68 61 74 20 74 68 65 |ts.only |that the|
|00003640| 20 66 69 6c 65 20 65 78 | 69 73 74 73 20 69 6e 20 | file ex|ists in |
|00003650| 74 68 61 74 20 64 69 72 | 65 63 74 6f 72 79 20 61 |that dir|ectory a|
|00003660| 6e 64 20 6e 6f 74 20 69 | 6e 20 74 68 65 20 6f 74 |nd not i|n the ot|
|00003670| 68 65 72 2e 20 20 59 6f | 75 0a 63 61 6e 20 6d 61 |her. Yo|u.can ma|
|00003680| 6b 65 20 60 64 69 66 66 | 27 20 61 63 74 20 61 73 |ke `diff|' act as|
|00003690| 20 74 68 6f 75 67 68 20 | 74 68 65 20 66 69 6c 65 | though |the file|
|000036a0| 20 65 78 69 73 74 65 64 | 20 62 75 74 20 77 61 73 | existed| but was|
|000036b0| 20 65 6d 70 74 79 20 69 | 6e 20 74 68 65 0a 6f 74 | empty i|n the.ot|
|000036c0| 68 65 72 20 64 69 72 65 | 63 74 6f 72 79 2c 20 73 |her dire|ctory, s|
|000036d0| 6f 20 74 68 61 74 20 69 | 74 20 6f 75 74 70 75 74 |o that i|t output|
|000036e0| 73 20 74 68 65 20 65 6e | 74 69 72 65 20 63 6f 6e |s the en|tire con|
|000036f0| 74 65 6e 74 73 20 6f 66 | 20 74 68 65 20 66 69 6c |tents of| the fil|
|00003700| 65 20 74 68 61 74 0a 61 | 63 74 75 61 6c 6c 79 20 |e that.a|ctually |
|00003710| 65 78 69 73 74 73 2e 20 | 20 28 49 74 20 69 73 20 |exists. | (It is |
|00003720| 6f 75 74 70 75 74 20 61 | 73 20 65 69 74 68 65 72 |output a|s either|
|00003730| 20 61 6e 20 69 6e 73 65 | 72 74 69 6f 6e 20 6f 72 | an inse|rtion or|
|00003740| 20 61 20 64 65 6c 65 74 | 69 6f 6e 2c 0a 64 65 70 | a delet|ion,.dep|
|00003750| 65 6e 64 69 6e 67 20 6f | 6e 20 77 68 65 74 68 65 |ending o|n whethe|
|00003760| 72 20 69 74 20 69 73 20 | 69 6e 20 74 68 65 20 66 |r it is |in the f|
|00003770| 69 72 73 74 20 6f 72 20 | 74 68 65 20 73 65 63 6f |irst or |the seco|
|00003780| 6e 64 20 64 69 72 65 63 | 74 6f 72 79 20 67 69 76 |nd direc|tory giv|
|00003790| 65 6e 2e 29 0a 54 6f 20 | 64 6f 20 74 68 69 73 2c |en.).To |do this,|
|000037a0| 20 75 73 65 20 74 68 65 | 20 60 2d 4e 27 20 6f 72 | use the| `-N' or|
|000037b0| 20 60 2d 2d 6e 65 77 2d | 66 69 6c 65 27 20 6f 70 | `--new-|file' op|
|000037c0| 74 69 6f 6e 2e 0a 0a 20 | 20 20 49 66 20 74 68 65 |tion... | If the|
|000037d0| 20 6f 6c 64 65 72 20 64 | 69 72 65 63 74 6f 72 79 | older d|irectory|
|000037e0| 20 63 6f 6e 74 61 69 6e | 73 20 6f 6e 65 20 6f 72 | contain|s one or|
|000037f0| 20 6d 6f 72 65 20 6c 61 | 72 67 65 20 66 69 6c 65 | more la|rge file|
|00003800| 73 20 74 68 61 74 20 61 | 72 65 20 6e 6f 74 0a 69 |s that a|re not.i|
|00003810| 6e 20 74 68 65 20 6e 65 | 77 65 72 20 64 69 72 65 |n the ne|wer dire|
|00003820| 63 74 6f 72 79 2c 20 79 | 6f 75 20 63 61 6e 20 6d |ctory, y|ou can m|
|00003830| 61 6b 65 20 74 68 65 20 | 70 61 74 63 68 20 73 6d |ake the |patch sm|
|00003840| 61 6c 6c 65 72 20 62 79 | 20 75 73 69 6e 67 20 74 |aller by| using t|
|00003850| 68 65 0a 60 2d 50 27 20 | 6f 72 20 60 2d 2d 75 6e |he.`-P' |or `--un|
|00003860| 69 64 69 72 65 63 74 69 | 6f 6e 61 6c 2d 6e 65 77 |idirecti|onal-new|
|00003870| 2d 66 69 6c 65 27 20 6f | 70 74 69 6f 6e 20 69 6e |-file' o|ption in|
|00003880| 73 74 65 61 64 20 6f 66 | 20 60 2d 4e 27 2e 20 20 |stead of| `-N'. |
|00003890| 54 68 69 73 0a 6f 70 74 | 69 6f 6e 20 69 73 20 6c |This.opt|ion is l|
|000038a0| 69 6b 65 20 60 2d 4e 27 | 20 65 78 63 65 70 74 20 |ike `-N'| except |
|000038b0| 74 68 61 74 20 69 74 20 | 6f 6e 6c 79 20 69 6e 73 |that it |only ins|
|000038c0| 65 72 74 73 20 74 68 65 | 20 63 6f 6e 74 65 6e 74 |erts the| content|
|000038d0| 73 20 6f 66 20 66 69 6c | 65 73 0a 74 68 61 74 20 |s of fil|es.that |
|000038e0| 61 70 70 65 61 72 20 69 | 6e 20 74 68 65 20 73 65 |appear i|n the se|
|000038f0| 63 6f 6e 64 20 64 69 72 | 65 63 74 6f 72 79 20 62 |cond dir|ectory b|
|00003900| 75 74 20 6e 6f 74 20 74 | 68 65 20 66 69 72 73 74 |ut not t|he first|
|00003910| 20 28 74 68 61 74 20 69 | 73 2c 20 66 69 6c 65 73 | (that i|s, files|
|00003920| 0a 74 68 61 74 20 77 65 | 72 65 20 61 64 64 65 64 |.that we|re added|
|00003930| 29 2e 20 20 41 74 20 74 | 68 65 20 74 6f 70 20 6f |). At t|he top o|
|00003940| 66 20 74 68 65 20 70 61 | 74 63 68 2c 20 77 72 69 |f the pa|tch, wri|
|00003950| 74 65 20 69 6e 73 74 72 | 75 63 74 69 6f 6e 73 20 |te instr|uctions |
|00003960| 66 6f 72 20 74 68 65 0a | 75 73 65 72 20 61 70 70 |for the.|user app|
|00003970| 6c 79 69 6e 67 20 74 68 | 65 20 70 61 74 63 68 20 |lying th|e patch |
|00003980| 74 6f 20 72 65 6d 6f 76 | 65 20 74 68 65 20 66 69 |to remov|e the fi|
|00003990| 6c 65 73 20 74 68 61 74 | 20 77 65 72 65 20 64 65 |les that| were de|
|000039a0| 6c 65 74 65 64 20 62 65 | 66 6f 72 65 0a 61 70 70 |leted be|fore.app|
|000039b0| 6c 79 69 6e 67 20 74 68 | 65 20 70 61 74 63 68 2e |lying th|e patch.|
|000039c0| 20 20 2a 4e 6f 74 65 20 | 4d 61 6b 69 6e 67 20 50 | *Note |Making P|
|000039d0| 61 74 63 68 65 73 3a 3a | 2c 20 66 6f 72 20 6d 6f |atches::|, for mo|
|000039e0| 72 65 20 64 69 73 63 75 | 73 73 69 6f 6e 20 6f 66 |re discu|ssion of|
|000039f0| 0a 6d 61 6b 69 6e 67 20 | 70 61 74 63 68 65 73 20 |.making |patches |
|00003a00| 66 6f 72 20 64 69 73 74 | 72 69 62 75 74 69 6f 6e |for dist|ribution|
|00003a10| 2e 0a 0a 20 20 20 54 6f | 20 69 67 6e 6f 72 65 20 |... To| ignore |
|00003a20| 73 6f 6d 65 20 66 69 6c | 65 73 20 77 68 69 6c 65 |some fil|es while|
|00003a30| 20 63 6f 6d 70 61 72 69 | 6e 67 20 64 69 72 65 63 | compari|ng direc|
|00003a40| 74 6f 72 69 65 73 2c 20 | 75 73 65 20 74 68 65 20 |tories, |use the |
|00003a50| 60 2d 78 0a 50 41 54 54 | 45 52 4e 27 20 6f 72 20 |`-x.PATT|ERN' or |
|00003a60| 60 2d 2d 65 78 63 6c 75 | 64 65 3d 50 41 54 54 45 |`--exclu|de=PATTE|
|00003a70| 52 4e 27 20 6f 70 74 69 | 6f 6e 2e 20 20 54 68 69 |RN' opti|on. Thi|
|00003a80| 73 20 6f 70 74 69 6f 6e | 20 69 67 6e 6f 72 65 73 |s option| ignores|
|00003a90| 20 61 6e 79 20 66 69 6c | 65 73 0a 6f 72 20 73 75 | any fil|es.or su|
|00003aa0| 62 64 69 72 65 63 74 6f | 72 69 65 73 20 77 68 6f |bdirecto|ries who|
|00003ab0| 73 65 20 62 61 73 65 20 | 6e 61 6d 65 73 20 6d 61 |se base |names ma|
|00003ac0| 74 63 68 20 74 68 65 20 | 73 68 65 6c 6c 20 70 61 |tch the |shell pa|
|00003ad0| 74 74 65 72 6e 20 50 41 | 54 54 45 52 4e 2e 0a 55 |ttern PA|TTERN..U|
|00003ae0| 6e 6c 69 6b 65 20 69 6e | 20 74 68 65 20 73 68 65 |nlike in| the she|
|00003af0| 6c 6c 2c 20 61 20 70 65 | 72 69 6f 64 20 61 74 20 |ll, a pe|riod at |
|00003b00| 74 68 65 20 73 74 61 72 | 74 20 6f 66 20 74 68 65 |the star|t of the|
|00003b10| 20 62 61 73 65 20 6f 66 | 20 61 20 66 69 6c 65 20 | base of| a file |
|00003b20| 6e 61 6d 65 0a 6d 61 74 | 63 68 65 73 20 61 20 77 |name.mat|ches a w|
|00003b30| 69 6c 64 63 61 72 64 20 | 61 74 20 74 68 65 20 73 |ildcard |at the s|
|00003b40| 74 61 72 74 20 6f 66 20 | 61 20 70 61 74 74 65 72 |tart of |a patter|
|00003b50| 6e 2e 20 20 59 6f 75 20 | 73 68 6f 75 6c 64 20 65 |n. You |should e|
|00003b60| 6e 63 6c 6f 73 65 0a 50 | 41 54 54 45 52 4e 20 69 |nclose.P|ATTERN i|
|00003b70| 6e 20 71 75 6f 74 65 73 | 20 73 6f 20 74 68 61 74 |n quotes| so that|
|00003b80| 20 74 68 65 20 73 68 65 | 6c 6c 20 64 6f 65 73 20 | the she|ll does |
|00003b90| 6e 6f 74 20 65 78 70 61 | 6e 64 20 69 74 2e 20 20 |not expa|nd it. |
|00003ba0| 46 6f 72 20 65 78 61 6d | 70 6c 65 2c 0a 74 68 65 |For exam|ple,.the|
|00003bb0| 20 6f 70 74 69 6f 6e 20 | 60 2d 78 20 27 2a 2e 5b | option |`-x '*.[|
|00003bc0| 61 6f 5d 27 27 20 69 67 | 6e 6f 72 65 73 20 61 6e |ao]'' ig|nores an|
|00003bd0| 79 20 66 69 6c 65 20 77 | 68 6f 73 65 20 6e 61 6d |y file w|hose nam|
|00003be0| 65 20 65 6e 64 73 20 77 | 69 74 68 20 60 2e 61 27 |e ends w|ith `.a'|
|00003bf0| 20 6f 72 0a 60 2e 6f 27 | 2e 0a 0a 20 20 20 54 68 | or.`.o'|... Th|
|00003c00| 69 73 20 6f 70 74 69 6f | 6e 20 61 63 63 75 6d 75 |is optio|n accumu|
|00003c10| 6c 61 74 65 73 20 69 66 | 20 79 6f 75 20 73 70 65 |lates if| you spe|
|00003c20| 63 69 66 79 20 69 74 20 | 6d 6f 72 65 20 74 68 61 |cify it |more tha|
|00003c30| 6e 20 6f 6e 63 65 2e 20 | 20 46 6f 72 0a 65 78 61 |n once. | For.exa|
|00003c40| 6d 70 6c 65 2c 20 75 73 | 69 6e 67 20 74 68 65 20 |mple, us|ing the |
|00003c50| 6f 70 74 69 6f 6e 73 20 | 60 2d 78 20 27 52 43 53 |options |`-x 'RCS|
|00003c60| 27 20 2d 78 20 27 2a 2c | 76 27 27 20 69 67 6e 6f |' -x '*,|v'' igno|
|00003c70| 72 65 73 20 61 6e 79 20 | 66 69 6c 65 20 6f 72 0a |res any |file or.|
|00003c80| 73 75 62 64 69 72 65 63 | 74 6f 72 79 20 77 68 6f |subdirec|tory who|
|00003c90| 73 65 20 62 61 73 65 20 | 6e 61 6d 65 20 69 73 20 |se base |name is |
|00003ca0| 60 52 43 53 27 20 6f 72 | 20 65 6e 64 73 20 77 69 |`RCS' or| ends wi|
|00003cb0| 74 68 20 60 2c 76 27 2e | 0a 0a 20 20 20 49 66 20 |th `,v'.|.. If |
|00003cc0| 79 6f 75 20 6e 65 65 64 | 20 74 6f 20 67 69 76 65 |you need| to give|
|00003cd0| 20 74 68 69 73 20 6f 70 | 74 69 6f 6e 20 6d 61 6e | this op|tion man|
|00003ce0| 79 20 74 69 6d 65 73 2c | 20 79 6f 75 20 63 61 6e |y times,| you can|
|00003cf0| 20 69 6e 73 74 65 61 64 | 20 70 75 74 20 74 68 65 | instead| put the|
|00003d00| 0a 70 61 74 74 65 72 6e | 73 20 69 6e 20 61 20 66 |.pattern|s in a f|
|00003d10| 69 6c 65 2c 20 6f 6e 65 | 20 70 61 74 74 65 72 6e |ile, one| pattern|
|00003d20| 20 70 65 72 20 6c 69 6e | 65 2c 20 61 6e 64 20 75 | per lin|e, and u|
|00003d30| 73 65 20 74 68 65 20 60 | 2d 58 20 46 49 4c 45 27 |se the `|-X FILE'|
|00003d40| 20 6f 72 0a 60 2d 2d 65 | 78 63 6c 75 64 65 2d 66 | or.`--e|xclude-f|
|00003d50| 72 6f 6d 3d 46 49 4c 45 | 27 20 6f 70 74 69 6f 6e |rom=FILE|' option|
|00003d60| 2e 0a 0a 20 20 20 49 66 | 20 79 6f 75 20 68 61 76 |... If| you hav|
|00003d70| 65 20 62 65 65 6e 20 63 | 6f 6d 70 61 72 69 6e 67 |e been c|omparing|
|00003d80| 20 74 77 6f 20 64 69 72 | 65 63 74 6f 72 69 65 73 | two dir|ectories|
|00003d90| 20 61 6e 64 20 73 74 6f | 70 70 65 64 20 70 61 72 | and sto|pped par|
|00003da0| 74 77 61 79 0a 74 68 72 | 6f 75 67 68 2c 20 6c 61 |tway.thr|ough, la|
|00003db0| 74 65 72 20 79 6f 75 20 | 6d 69 67 68 74 20 77 61 |ter you |might wa|
|00003dc0| 6e 74 20 74 6f 20 63 6f | 6e 74 69 6e 75 65 20 77 |nt to co|ntinue w|
|00003dd0| 68 65 72 65 20 79 6f 75 | 20 6c 65 66 74 20 6f 66 |here you| left of|
|00003de0| 66 2e 20 20 59 6f 75 20 | 63 61 6e 0a 64 6f 20 74 |f. You |can.do t|
|00003df0| 68 69 73 20 62 79 20 75 | 73 69 6e 67 20 74 68 65 |his by u|sing the|
|00003e00| 20 60 2d 53 20 46 49 4c | 45 27 20 6f 72 20 60 2d | `-S FIL|E' or `-|
|00003e10| 2d 73 74 61 72 74 69 6e | 67 2d 66 69 6c 65 3d 46 |-startin|g-file=F|
|00003e20| 49 4c 45 27 20 6f 70 74 | 69 6f 6e 2e 20 20 54 68 |ILE' opt|ion. Th|
|00003e30| 69 73 0a 63 6f 6d 70 61 | 72 65 73 20 6f 6e 6c 79 |is.compa|res only|
|00003e40| 20 74 68 65 20 66 69 6c | 65 20 46 49 4c 45 20 61 | the fil|e FILE a|
|00003e50| 6e 64 20 61 6c 6c 20 61 | 6c 70 68 61 62 65 74 69 |nd all a|lphabeti|
|00003e60| 63 61 6c 6c 79 20 6c 61 | 74 65 72 20 66 69 6c 65 |cally la|ter file|
|00003e70| 73 20 69 6e 20 74 68 65 | 0a 74 6f 70 6d 6f 73 74 |s in the|.topmost|
|00003e80| 20 64 69 72 65 63 74 6f | 72 79 20 6c 65 76 65 6c | directo|ry level|
|00003e90| 2e 0a 0a 1f 0a 46 69 6c | 65 3a 20 64 69 66 66 2e |.....Fil|e: diff.|
|00003ea0| 69 6e 66 6f 2c 20 20 4e | 6f 64 65 3a 20 41 64 6a |info, N|ode: Adj|
|00003eb0| 75 73 74 69 6e 67 20 4f | 75 74 70 75 74 2c 20 20 |usting O|utput, |
|00003ec0| 4e 65 78 74 3a 20 64 69 | 66 66 20 50 65 72 66 6f |Next: di|ff Perfo|
|00003ed0| 72 6d 61 6e 63 65 2c 20 | 20 50 72 65 76 3a 20 43 |rmance, | Prev: C|
|00003ee0| 6f 6d 70 61 72 69 6e 67 | 20 44 69 72 65 63 74 6f |omparing| Directo|
|00003ef0| 72 69 65 73 2c 20 20 55 | 70 3a 20 54 6f 70 0a 0a |ries, U|p: Top..|
|00003f00| 4d 61 6b 69 6e 67 20 60 | 64 69 66 66 27 20 4f 75 |Making `|diff' Ou|
|00003f10| 74 70 75 74 20 50 72 65 | 74 74 69 65 72 0a 2a 2a |tput Pre|ttier.**|
|00003f20| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00003f30| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 0a 0a 20 20 20 |********|***.. |
|00003f40| 60 64 69 66 66 27 20 70 | 72 6f 76 69 64 65 73 20 |`diff' p|rovides |
|00003f50| 73 65 76 65 72 61 6c 20 | 77 61 79 73 20 74 6f 20 |several |ways to |
|00003f60| 61 64 6a 75 73 74 20 74 | 68 65 20 61 70 70 65 61 |adjust t|he appea|
|00003f70| 72 61 6e 63 65 20 6f 66 | 20 69 74 73 20 6f 75 74 |rance of| its out|
|00003f80| 70 75 74 2e 0a 54 68 65 | 73 65 20 61 64 6a 75 73 |put..The|se adjus|
|00003f90| 74 6d 65 6e 74 73 20 63 | 61 6e 20 62 65 20 61 70 |tments c|an be ap|
|00003fa0| 70 6c 69 65 64 20 74 6f | 20 61 6e 79 20 6f 75 74 |plied to| any out|
|00003fb0| 70 75 74 20 66 6f 72 6d | 61 74 2e 0a 0a 2a 20 4d |put form|at...* M|
|00003fc0| 65 6e 75 3a 0a 0a 2a 20 | 54 61 62 73 3a 3a 09 09 |enu:..* |Tabs::..|
|00003fd0| 50 72 65 73 65 72 76 69 | 6e 67 20 74 68 65 20 61 |Preservi|ng the a|
|00003fe0| 6c 69 67 6e 6d 65 6e 74 | 20 6f 66 20 74 61 62 73 |lignment| of tabs|
|00003ff0| 74 6f 70 73 2e 0a 2a 20 | 50 61 67 69 6e 61 74 69 |tops..* |Paginati|
|00004000| 6f 6e 3a 3a 09 09 50 61 | 67 65 20 6e 75 6d 62 65 |on::..Pa|ge numbe|
|00004010| 72 69 6e 67 20 61 6e 64 | 20 74 69 6d 65 73 74 61 |ring and| timesta|
|00004020| 6d 70 69 6e 67 20 60 64 | 69 66 66 27 20 6f 75 74 |mping `d|iff' out|
|00004030| 70 75 74 2e 0a 0a 1f 0a | 46 69 6c 65 3a 20 64 69 |put.....|File: di|
|00004040| 66 66 2e 69 6e 66 6f 2c | 20 20 4e 6f 64 65 3a 20 |ff.info,| Node: |
|00004050| 54 61 62 73 2c 20 20 4e | 65 78 74 3a 20 50 61 67 |Tabs, N|ext: Pag|
|00004060| 69 6e 61 74 69 6f 6e 2c | 20 20 55 70 3a 20 41 64 |ination,| Up: Ad|
|00004070| 6a 75 73 74 69 6e 67 20 | 4f 75 74 70 75 74 0a 0a |justing |Output..|
|00004080| 50 72 65 73 65 72 76 69 | 6e 67 20 54 61 62 73 74 |Preservi|ng Tabst|
|00004090| 6f 70 20 41 6c 69 67 6e | 6d 65 6e 74 0a 3d 3d 3d |op Align|ment.===|
|000040a0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000040b0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 0a 0a 20 20 20 54 68 |========|=.. Th|
|000040c0| 65 20 6c 69 6e 65 73 20 | 6f 66 20 74 65 78 74 20 |e lines |of text |
|000040d0| 69 6e 20 73 6f 6d 65 20 | 6f 66 20 74 68 65 20 60 |in some |of the `|
|000040e0| 64 69 66 66 27 20 6f 75 | 74 70 75 74 20 66 6f 72 |diff' ou|tput for|
|000040f0| 6d 61 74 73 20 61 72 65 | 20 70 72 65 63 65 64 65 |mats are| precede|
|00004100| 64 0a 62 79 20 6f 6e 65 | 20 6f 72 20 74 77 6f 20 |d.by one| or two |
|00004110| 63 68 61 72 61 63 74 65 | 72 73 20 74 68 61 74 20 |characte|rs that |
|00004120| 69 6e 64 69 63 61 74 65 | 20 77 68 65 74 68 65 72 |indicate| whether|
|00004130| 20 74 68 65 20 74 65 78 | 74 20 69 73 20 69 6e 73 | the tex|t is ins|
|00004140| 65 72 74 65 64 2c 0a 64 | 65 6c 65 74 65 64 2c 20 |erted,.d|eleted, |
|00004150| 6f 72 20 63 68 61 6e 67 | 65 64 2e 20 20 54 68 65 |or chang|ed. The|
|00004160| 20 61 64 64 69 74 69 6f | 6e 20 6f 66 20 74 68 6f | additio|n of tho|
|00004170| 73 65 20 63 68 61 72 61 | 63 74 65 72 73 20 63 61 |se chara|cters ca|
|00004180| 6e 20 63 61 75 73 65 20 | 74 61 62 73 20 74 6f 0a |n cause |tabs to.|
|00004190| 6d 6f 76 65 20 74 6f 20 | 74 68 65 20 6e 65 78 74 |move to |the next|
|000041a0| 20 74 61 62 73 74 6f 70 | 2c 20 74 68 72 6f 77 69 | tabstop|, throwi|
|000041b0| 6e 67 20 6f 66 66 20 74 | 68 65 20 61 6c 69 67 6e |ng off t|he align|
|000041c0| 6d 65 6e 74 20 6f 66 20 | 63 6f 6c 75 6d 6e 73 20 |ment of |columns |
|000041d0| 69 6e 20 74 68 65 0a 6c | 69 6e 65 2e 20 20 47 4e |in the.l|ine. GN|
|000041e0| 55 20 60 64 69 66 66 27 | 20 70 72 6f 76 69 64 65 |U `diff'| provide|
|000041f0| 73 20 74 77 6f 20 77 61 | 79 73 20 74 6f 20 6d 61 |s two wa|ys to ma|
|00004200| 6b 65 20 74 61 62 2d 61 | 6c 69 67 6e 65 64 20 63 |ke tab-a|ligned c|
|00004210| 6f 6c 75 6d 6e 73 20 6c | 69 6e 65 20 75 70 0a 63 |olumns l|ine up.c|
|00004220| 6f 72 72 65 63 74 6c 79 | 2e 0a 0a 20 20 20 54 68 |orrectly|... Th|
|00004230| 65 20 66 69 72 73 74 20 | 77 61 79 20 69 73 20 74 |e first |way is t|
|00004240| 6f 20 68 61 76 65 20 60 | 64 69 66 66 27 20 63 6f |o have `|diff' co|
|00004250| 6e 76 65 72 74 20 61 6c | 6c 20 74 61 62 73 20 69 |nvert al|l tabs i|
|00004260| 6e 74 6f 20 74 68 65 20 | 63 6f 72 72 65 63 74 0a |nto the |correct.|
|00004270| 6e 75 6d 62 65 72 20 6f | 66 20 73 70 61 63 65 73 |number o|f spaces|
|00004280| 20 62 65 66 6f 72 65 20 | 6f 75 74 70 75 74 74 69 | before |outputti|
|00004290| 6e 67 20 74 68 65 6d 3b | 20 73 65 6c 65 63 74 20 |ng them;| select |
|000042a0| 74 68 69 73 20 6d 65 74 | 68 6f 64 20 77 69 74 68 |this met|hod with|
|000042b0| 20 74 68 65 0a 60 2d 74 | 27 20 6f 72 20 60 2d 2d | the.`-t|' or `--|
|000042c0| 65 78 70 61 6e 64 2d 74 | 61 62 73 27 20 6f 70 74 |expand-t|abs' opt|
|000042d0| 69 6f 6e 2e 20 20 60 64 | 69 66 66 27 20 61 73 73 |ion. `d|iff' ass|
|000042e0| 75 6d 65 73 20 74 68 61 | 74 20 74 61 62 73 74 6f |umes tha|t tabsto|
|000042f0| 70 73 20 61 72 65 20 73 | 65 74 0a 65 76 65 72 79 |ps are s|et.every|
|00004300| 20 38 20 63 6f 6c 75 6d | 6e 73 2e 20 20 54 6f 20 | 8 colum|ns. To |
|00004310| 75 73 65 20 74 68 69 73 | 20 66 6f 72 6d 20 6f 66 |use this| form of|
|00004320| 20 6f 75 74 70 75 74 20 | 77 69 74 68 20 60 70 61 | output |with `pa|
|00004330| 74 63 68 27 2c 20 79 6f | 75 20 6d 75 73 74 0a 67 |tch', yo|u must.g|
|00004340| 69 76 65 20 60 70 61 74 | 63 68 27 20 74 68 65 20 |ive `pat|ch' the |
|00004350| 60 2d 6c 27 20 6f 72 20 | 60 2d 2d 69 67 6e 6f 72 |`-l' or |`--ignor|
|00004360| 65 2d 77 68 69 74 65 2d | 73 70 61 63 65 27 20 6f |e-white-|space' o|
|00004370| 70 74 69 6f 6e 20 28 2a | 6e 6f 74 65 20 43 68 61 |ption (*|note Cha|
|00004380| 6e 67 65 64 0a 57 68 69 | 74 65 20 53 70 61 63 65 |nged.Whi|te Space|
|00004390| 3a 3a 2e 2c 20 66 6f 72 | 20 6d 6f 72 65 20 69 6e |::., for| more in|
|000043a0| 66 6f 72 6d 61 74 69 6f | 6e 29 2e 0a 0a 20 20 20 |formatio|n)... |
|000043b0| 54 68 65 20 6f 74 68 65 | 72 20 6d 65 74 68 6f 64 |The othe|r method|
|000043c0| 20 66 6f 72 20 6d 61 6b | 69 6e 67 20 74 61 62 73 | for mak|ing tabs|
|000043d0| 20 6c 69 6e 65 20 75 70 | 20 63 6f 72 72 65 63 74 | line up| correct|
|000043e0| 6c 79 20 69 73 20 74 6f | 20 61 64 64 20 61 20 74 |ly is to| add a t|
|000043f0| 61 62 0a 63 68 61 72 61 | 63 74 65 72 20 69 6e 73 |ab.chara|cter ins|
|00004400| 74 65 61 64 20 6f 66 20 | 61 20 73 70 61 63 65 20 |tead of |a space |
|00004410| 61 66 74 65 72 20 74 68 | 65 20 69 6e 64 69 63 61 |after th|e indica|
|00004420| 74 6f 72 20 63 68 61 72 | 61 63 74 65 72 20 61 74 |tor char|acter at|
|00004430| 20 74 68 65 0a 62 65 67 | 69 6e 6e 69 6e 67 20 6f | the.beg|inning o|
|00004440| 66 20 74 68 65 20 6c 69 | 6e 65 2e 20 20 54 68 69 |f the li|ne. Thi|
|00004450| 73 20 65 6e 73 75 72 65 | 73 20 74 68 61 74 20 61 |s ensure|s that a|
|00004460| 6c 6c 20 66 6f 6c 6c 6f | 77 69 6e 67 20 74 61 62 |ll follo|wing tab|
|00004470| 20 63 68 61 72 61 63 74 | 65 72 73 0a 61 72 65 20 | charact|ers.are |
|00004480| 69 6e 20 74 68 65 20 73 | 61 6d 65 20 70 6f 73 69 |in the s|ame posi|
|00004490| 74 69 6f 6e 20 72 65 6c | 61 74 69 76 65 20 74 6f |tion rel|ative to|
|000044a0| 20 74 61 62 73 74 6f 70 | 73 20 74 68 61 74 20 74 | tabstop|s that t|
|000044b0| 68 65 79 20 77 65 72 65 | 20 69 6e 20 74 68 65 0a |hey were| in the.|
|000044c0| 6f 72 69 67 69 6e 61 6c | 20 66 69 6c 65 73 2c 20 |original| files, |
|000044d0| 73 6f 20 74 68 61 74 20 | 74 68 65 20 6f 75 74 70 |so that |the outp|
|000044e0| 75 74 20 69 73 20 61 6c | 69 67 6e 65 64 20 63 6f |ut is al|igned co|
|000044f0| 72 72 65 63 74 6c 79 2e | 20 20 49 74 73 0a 64 69 |rrectly.| Its.di|
|00004500| 73 61 64 76 61 6e 74 61 | 67 65 20 69 73 20 74 68 |sadvanta|ge is th|
|00004510| 61 74 20 69 74 20 63 61 | 6e 20 6d 61 6b 65 20 6c |at it ca|n make l|
|00004520| 6f 6e 67 20 6c 69 6e 65 | 73 20 74 6f 6f 20 6c 6f |ong line|s too lo|
|00004530| 6e 67 20 74 6f 20 66 69 | 74 20 6f 6e 20 6f 6e 65 |ng to fi|t on one|
|00004540| 20 6c 69 6e 65 0a 6f 66 | 20 74 68 65 20 73 63 72 | line.of| the scr|
|00004550| 65 65 6e 20 6f 72 20 74 | 68 65 20 70 61 70 65 72 |een or t|he paper|
|00004560| 2e 20 20 49 74 20 61 6c | 73 6f 20 64 6f 65 73 20 |. It al|so does |
|00004570| 6e 6f 74 20 77 6f 72 6b | 20 77 69 74 68 20 74 68 |not work| with th|
|00004580| 65 20 75 6e 69 66 69 65 | 64 0a 6f 75 74 70 75 74 |e unifie|d.output|
|00004590| 20 66 6f 72 6d 61 74 2c | 20 77 68 69 63 68 20 64 | format,| which d|
|000045a0| 6f 65 73 20 6e 6f 74 20 | 68 61 76 65 20 61 20 73 |oes not |have a s|
|000045b0| 70 61 63 65 20 63 68 61 | 72 61 63 74 65 72 20 61 |pace cha|racter a|
|000045c0| 66 74 65 72 20 74 68 65 | 20 63 68 61 6e 67 65 0a |fter the| change.|
|000045d0| 74 79 70 65 20 69 6e 64 | 69 63 61 74 6f 72 20 63 |type ind|icator c|
|000045e0| 68 61 72 61 63 74 65 72 | 2e 20 20 53 65 6c 65 63 |haracter|. Selec|
|000045f0| 74 20 74 68 69 73 20 6d | 65 74 68 6f 64 20 77 69 |t this m|ethod wi|
|00004600| 74 68 20 74 68 65 20 60 | 2d 54 27 20 6f 72 0a 60 |th the `|-T' or.`|
|00004610| 2d 2d 69 6e 69 74 69 61 | 6c 2d 74 61 62 27 20 6f |--initia|l-tab' o|
|00004620| 70 74 69 6f 6e 2e 0a 0a | 1f 0a 46 69 6c 65 3a 20 |ption...|..File: |
|00004630| 64 69 66 66 2e 69 6e 66 | 6f 2c 20 20 4e 6f 64 65 |diff.inf|o, Node|
|00004640| 3a 20 50 61 67 69 6e 61 | 74 69 6f 6e 2c 20 20 50 |: Pagina|tion, P|
|00004650| 72 65 76 3a 20 54 61 62 | 73 2c 20 20 55 70 3a 20 |rev: Tab|s, Up: |
|00004660| 41 64 6a 75 73 74 69 6e | 67 20 4f 75 74 70 75 74 |Adjustin|g Output|
|00004670| 0a 0a 50 61 67 69 6e 61 | 74 69 6e 67 20 60 64 69 |..Pagina|ting `di|
|00004680| 66 66 27 20 4f 75 74 70 | 75 74 0a 3d 3d 3d 3d 3d |ff' Outp|ut.=====|
|00004690| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000046a0| 3d 3d 3d 0a 0a 20 20 20 | 49 74 20 63 61 6e 20 62 |===.. |It can b|
|000046b0| 65 20 63 6f 6e 76 65 6e | 69 65 6e 74 20 74 6f 20 |e conven|ient to |
|000046c0| 68 61 76 65 20 6c 6f 6e | 67 20 6f 75 74 70 75 74 |have lon|g output|
|000046d0| 20 70 61 67 65 2d 6e 75 | 6d 62 65 72 65 64 20 61 | page-nu|mbered a|
|000046e0| 6e 64 0a 74 69 6d 65 2d | 73 74 61 6d 70 65 64 2e |nd.time-|stamped.|
|000046f0| 20 20 54 68 65 20 60 2d | 6c 27 20 61 6e 64 20 60 | The `-|l' and `|
|00004700| 2d 2d 70 61 67 69 6e 61 | 74 65 27 20 6f 70 74 69 |--pagina|te' opti|
|00004710| 6f 6e 73 20 64 6f 20 74 | 68 69 73 20 62 79 20 73 |ons do t|his by s|
|00004720| 65 6e 64 69 6e 67 20 74 | 68 65 0a 60 64 69 66 66 |ending t|he.`diff|
|00004730| 27 20 6f 75 74 70 75 74 | 20 74 68 72 6f 75 67 68 |' output| through|
|00004740| 20 74 68 65 20 60 70 72 | 27 20 70 72 6f 67 72 61 | the `pr|' progra|
|00004750| 6d 2e 20 20 48 65 72 65 | 20 69 73 20 77 68 61 74 |m. Here| is what|
|00004760| 20 74 68 65 20 70 61 67 | 65 20 68 65 61 64 65 72 | the pag|e header|
|00004770| 0a 6d 69 67 68 74 20 6c | 6f 6f 6b 20 6c 69 6b 65 |.might l|ook like|
|00004780| 20 66 6f 72 20 60 64 69 | 66 66 20 2d 6c 63 20 6c | for `di|ff -lc l|
|00004790| 61 6f 20 74 7a 75 27 3a | 0a 0a 20 20 20 20 20 4d |ao tzu':|.. M|
|000047a0| 61 72 20 31 31 20 31 33 | 3a 33 37 20 31 39 39 31 |ar 11 13|:37 1991|
|000047b0| 20 20 64 69 66 66 20 2d | 6c 63 20 6c 61 6f 20 74 | diff -|lc lao t|
|000047c0| 7a 75 20 50 61 67 65 20 | 31 0a 0a 1f 0a 46 69 6c |zu Page |1....Fil|
|000047d0| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|000047e0| 6f 64 65 3a 20 64 69 66 | 66 20 50 65 72 66 6f 72 |ode: dif|f Perfor|
|000047f0| 6d 61 6e 63 65 2c 20 20 | 4e 65 78 74 3a 20 43 6f |mance, |Next: Co|
|00004800| 6d 70 61 72 69 6e 67 20 | 54 68 72 65 65 20 46 69 |mparing |Three Fi|
|00004810| 6c 65 73 2c 20 20 50 72 | 65 76 3a 20 41 64 6a 75 |les, Pr|ev: Adju|
|00004820| 73 74 69 6e 67 20 4f 75 | 74 70 75 74 2c 20 20 55 |sting Ou|tput, U|
|00004830| 70 3a 20 54 6f 70 0a 0a | 60 64 69 66 66 27 20 50 |p: Top..|`diff' P|
|00004840| 65 72 66 6f 72 6d 61 6e | 63 65 20 54 72 61 64 65 |erforman|ce Trade|
|00004850| 6f 66 66 73 0a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |offs.***|********|
|00004860| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00004870| 2a 0a 0a 20 20 20 47 4e | 55 20 60 64 69 66 66 27 |*.. GN|U `diff'|
|00004880| 20 72 75 6e 73 20 71 75 | 69 74 65 20 65 66 66 69 | runs qu|ite effi|
|00004890| 63 69 65 6e 74 6c 79 3b | 20 68 6f 77 65 76 65 72 |ciently;| however|
|000048a0| 2c 20 69 6e 20 73 6f 6d | 65 20 63 69 72 63 75 6d |, in som|e circum|
|000048b0| 73 74 61 6e 63 65 73 0a | 79 6f 75 20 63 61 6e 20 |stances.|you can |
|000048c0| 63 61 75 73 65 20 69 74 | 20 74 6f 20 72 75 6e 20 |cause it| to run |
|000048d0| 66 61 73 74 65 72 20 6f | 72 20 70 72 6f 64 75 63 |faster o|r produc|
|000048e0| 65 20 61 20 6d 6f 72 65 | 20 63 6f 6d 70 61 63 74 |e a more| compact|
|000048f0| 20 73 65 74 20 6f 66 20 | 63 68 61 6e 67 65 73 2e | set of |changes.|
|00004900| 0a 54 68 65 72 65 20 61 | 72 65 20 74 77 6f 20 77 |.There a|re two w|
|00004910| 61 79 73 20 74 68 61 74 | 20 79 6f 75 20 63 61 6e |ays that| you can|
|00004920| 20 61 66 66 65 63 74 20 | 74 68 65 20 70 65 72 66 | affect |the perf|
|00004930| 6f 72 6d 61 6e 63 65 20 | 6f 66 20 47 4e 55 20 60 |ormance |of GNU `|
|00004940| 64 69 66 66 27 20 62 79 | 0a 63 68 61 6e 67 69 6e |diff' by|.changin|
|00004950| 67 20 74 68 65 20 77 61 | 79 20 69 74 20 63 6f 6d |g the wa|y it com|
|00004960| 70 61 72 65 73 20 66 69 | 6c 65 73 2e 0a 0a 20 20 |pares fi|les... |
|00004970| 20 50 65 72 66 6f 72 6d | 61 6e 63 65 20 68 61 73 | Perform|ance has|
|00004980| 20 6d 6f 72 65 20 74 68 | 61 6e 20 6f 6e 65 20 64 | more th|an one d|
|00004990| 69 6d 65 6e 73 69 6f 6e | 2e 20 20 54 68 65 73 65 |imension|. These|
|000049a0| 20 6f 70 74 69 6f 6e 73 | 20 69 6d 70 72 6f 76 65 | options| improve|
|000049b0| 20 6f 6e 65 0a 61 73 70 | 65 63 74 20 6f 66 20 70 | one.asp|ect of p|
|000049c0| 65 72 66 6f 72 6d 61 6e | 63 65 20 61 74 20 74 68 |erforman|ce at th|
|000049d0| 65 20 63 6f 73 74 20 6f | 66 20 61 6e 6f 74 68 65 |e cost o|f anothe|
|000049e0| 72 2c 20 6f 72 20 74 68 | 65 79 20 69 6d 70 72 6f |r, or th|ey impro|
|000049f0| 76 65 0a 70 65 72 66 6f | 72 6d 61 6e 63 65 20 69 |ve.perfo|rmance i|
|00004a00| 6e 20 73 6f 6d 65 20 63 | 61 73 65 73 20 77 68 69 |n some c|ases whi|
|00004a10| 6c 65 20 68 75 72 74 69 | 6e 67 20 69 74 20 69 6e |le hurti|ng it in|
|00004a20| 20 6f 74 68 65 72 73 2e | 0a 0a 20 20 20 54 68 65 | others.|.. The|
|00004a30| 20 77 61 79 20 74 68 61 | 74 20 47 4e 55 20 60 64 | way tha|t GNU `d|
|00004a40| 69 66 66 27 20 64 65 74 | 65 72 6d 69 6e 65 73 20 |iff' det|ermines |
|00004a50| 77 68 69 63 68 20 6c 69 | 6e 65 73 20 68 61 76 65 |which li|nes have|
|00004a60| 20 63 68 61 6e 67 65 64 | 20 61 6c 77 61 79 73 0a | changed| always.|
|00004a70| 63 6f 6d 65 73 20 75 70 | 20 77 69 74 68 20 61 20 |comes up| with a |
|00004a80| 6e 65 61 72 2d 6d 69 6e | 69 6d 61 6c 20 73 65 74 |near-min|imal set|
|00004a90| 20 6f 66 20 64 69 66 66 | 65 72 65 6e 63 65 73 2e | of diff|erences.|
|00004aa0| 20 20 55 73 75 61 6c 6c | 79 20 69 74 20 69 73 20 | Usuall|y it is |
|00004ab0| 67 6f 6f 64 0a 65 6e 6f | 75 67 68 20 66 6f 72 20 |good.eno|ugh for |
|00004ac0| 70 72 61 63 74 69 63 61 | 6c 20 70 75 72 70 6f 73 |practica|l purpos|
|00004ad0| 65 73 2e 20 20 49 66 20 | 74 68 65 20 60 64 69 66 |es. If |the `dif|
|00004ae0| 66 27 20 6f 75 74 70 75 | 74 20 69 73 20 6c 61 72 |f' outpu|t is lar|
|00004af0| 67 65 2c 20 79 6f 75 0a | 6d 69 67 68 74 20 77 61 |ge, you.|might wa|
|00004b00| 6e 74 20 60 64 69 66 66 | 27 20 74 6f 20 75 73 65 |nt `diff|' to use|
|00004b10| 20 61 20 6d 6f 64 69 66 | 69 65 64 20 61 6c 67 6f | a modif|ied algo|
|00004b20| 72 69 74 68 6d 20 74 68 | 61 74 20 73 6f 6d 65 74 |rithm th|at somet|
|00004b30| 69 6d 65 73 20 70 72 6f | 64 75 63 65 73 20 61 0a |imes pro|duces a.|
|00004b40| 73 6d 61 6c 6c 65 72 20 | 73 65 74 20 6f 66 20 64 |smaller |set of d|
|00004b50| 69 66 66 65 72 65 6e 63 | 65 73 2e 20 20 54 68 65 |ifferenc|es. The|
|00004b60| 20 60 2d 64 27 20 6f 72 | 20 60 2d 2d 6d 69 6e 69 | `-d' or| `--mini|
|00004b70| 6d 61 6c 27 20 6f 70 74 | 69 6f 6e 20 64 6f 65 73 |mal' opt|ion does|
|00004b80| 20 74 68 69 73 3b 0a 68 | 6f 77 65 76 65 72 2c 20 | this;.h|owever, |
|00004b90| 69 74 20 63 61 6e 20 61 | 6c 73 6f 20 63 61 75 73 |it can a|lso caus|
|00004ba0| 65 20 60 64 69 66 66 27 | 20 74 6f 20 72 75 6e 20 |e `diff'| to run |
|00004bb0| 6d 6f 72 65 20 73 6c 6f | 77 6c 79 20 74 68 61 6e |more slo|wly than|
|00004bc0| 20 75 73 75 61 6c 2c 20 | 73 6f 20 69 74 0a 69 73 | usual, |so it.is|
|00004bd0| 20 6e 6f 74 20 74 68 65 | 20 64 65 66 61 75 6c 74 | not the| default|
|00004be0| 20 62 65 68 61 76 69 6f | 72 2e 0a 0a 20 20 20 57 | behavio|r... W|
|00004bf0| 68 65 6e 20 74 68 65 20 | 66 69 6c 65 73 20 79 6f |hen the |files yo|
|00004c00| 75 20 61 72 65 20 63 6f | 6d 70 61 72 69 6e 67 20 |u are co|mparing |
|00004c10| 61 72 65 20 6c 61 72 67 | 65 20 61 6e 64 20 68 61 |are larg|e and ha|
|00004c20| 76 65 20 73 6d 61 6c 6c | 20 67 72 6f 75 70 73 20 |ve small| groups |
|00004c30| 6f 66 0a 63 68 61 6e 67 | 65 73 20 73 63 61 74 74 |of.chang|es scatt|
|00004c40| 65 72 65 64 20 74 68 72 | 6f 75 67 68 6f 75 74 20 |ered thr|oughout |
|00004c50| 74 68 65 6d 2c 20 79 6f | 75 20 63 61 6e 20 75 73 |them, yo|u can us|
|00004c60| 65 20 74 68 65 20 60 2d | 48 27 20 6f 72 0a 60 2d |e the `-|H' or.`-|
|00004c70| 2d 73 70 65 65 64 2d 6c | 61 72 67 65 2d 66 69 6c |-speed-l|arge-fil|
|00004c80| 65 73 27 20 6f 70 74 69 | 6f 6e 20 74 6f 20 6d 61 |es' opti|on to ma|
|00004c90| 6b 65 20 61 20 64 69 66 | 66 65 72 65 6e 74 20 6d |ke a dif|ferent m|
|00004ca0| 6f 64 69 66 69 63 61 74 | 69 6f 6e 20 74 6f 20 74 |odificat|ion to t|
|00004cb0| 68 65 0a 61 6c 67 6f 72 | 69 74 68 6d 20 74 68 61 |he.algor|ithm tha|
|00004cc0| 74 20 60 64 69 66 66 27 | 20 75 73 65 73 2e 20 20 |t `diff'| uses. |
|00004cd0| 49 66 20 74 68 65 20 69 | 6e 70 75 74 20 66 69 6c |If the i|nput fil|
|00004ce0| 65 73 20 68 61 76 65 20 | 61 20 63 6f 6e 73 74 61 |es have |a consta|
|00004cf0| 6e 74 20 73 6d 61 6c 6c | 0a 64 65 6e 73 69 74 79 |nt small|.density|
|00004d00| 20 6f 66 20 63 68 61 6e | 67 65 73 2c 20 74 68 69 | of chan|ges, thi|
|00004d10| 73 20 6f 70 74 69 6f 6e | 20 73 70 65 65 64 73 20 |s option| speeds |
|00004d20| 75 70 20 74 68 65 20 63 | 6f 6d 70 61 72 69 73 6f |up the c|ompariso|
|00004d30| 6e 73 20 77 69 74 68 6f | 75 74 0a 63 68 61 6e 67 |ns witho|ut.chang|
|00004d40| 69 6e 67 20 74 68 65 20 | 6f 75 74 70 75 74 2e 20 |ing the |output. |
|00004d50| 20 49 66 20 6e 6f 74 2c | 20 60 64 69 66 66 27 20 | If not,| `diff' |
|00004d60| 6d 69 67 68 74 20 70 72 | 6f 64 75 63 65 20 61 20 |might pr|oduce a |
|00004d70| 6c 61 72 67 65 72 20 73 | 65 74 20 6f 66 0a 64 69 |larger s|et of.di|
|00004d80| 66 66 65 72 65 6e 63 65 | 73 3b 20 68 6f 77 65 76 |fference|s; howev|
|00004d90| 65 72 2c 20 74 68 65 20 | 6f 75 74 70 75 74 20 77 |er, the |output w|
|00004da0| 69 6c 6c 20 73 74 69 6c | 6c 20 62 65 20 63 6f 72 |ill stil|l be cor|
|00004db0| 72 65 63 74 2e 0a 0a 20 | 20 20 4e 6f 72 6d 61 6c |rect... | Normal|
|00004dc0| 6c 79 20 60 64 69 66 66 | 27 20 64 69 73 63 61 72 |ly `diff|' discar|
|00004dd0| 64 73 20 74 68 65 20 70 | 72 65 66 69 78 20 61 6e |ds the p|refix an|
|00004de0| 64 20 73 75 66 66 69 78 | 20 74 68 61 74 20 69 73 |d suffix| that is|
|00004df0| 20 63 6f 6d 6d 6f 6e 20 | 74 6f 0a 62 6f 74 68 20 | common |to.both |
|00004e00| 66 69 6c 65 73 20 62 65 | 66 6f 72 65 20 69 74 20 |files be|fore it |
|00004e10| 61 74 74 65 6d 70 74 73 | 20 74 6f 20 66 69 6e 64 |attempts| to find|
|00004e20| 20 61 20 6d 69 6e 69 6d | 61 6c 20 73 65 74 20 6f | a minim|al set o|
|00004e30| 66 20 64 69 66 66 65 72 | 65 6e 63 65 73 2e 0a 54 |f differ|ences..T|
|00004e40| 68 69 73 20 6d 61 6b 65 | 73 20 60 64 69 66 66 27 |his make|s `diff'|
|00004e50| 20 72 75 6e 20 66 61 73 | 74 65 72 2c 20 62 75 74 | run fas|ter, but|
|00004e60| 20 6f 63 63 61 73 69 6f | 6e 61 6c 6c 79 20 69 74 | occasio|nally it|
|00004e70| 20 6d 61 79 20 70 72 6f | 64 75 63 65 0a 6e 6f 6e | may pro|duce.non|
|00004e80| 2d 6d 69 6e 69 6d 61 6c | 20 6f 75 74 70 75 74 2e |-minimal| output.|
|00004e90| 20 20 54 68 65 20 60 2d | 2d 68 6f 72 69 7a 6f 6e | The `-|-horizon|
|00004ea0| 2d 6c 69 6e 65 73 3d 4c | 49 4e 45 53 27 20 6f 70 |-lines=L|INES' op|
|00004eb0| 74 69 6f 6e 20 70 72 65 | 76 65 6e 74 73 20 60 64 |tion pre|vents `d|
|00004ec0| 69 66 66 27 0a 66 72 6f | 6d 20 64 69 73 63 61 72 |iff'.fro|m discar|
|00004ed0| 64 69 6e 67 20 74 68 65 | 20 6c 61 73 74 20 4c 49 |ding the| last LI|
|00004ee0| 4e 45 53 20 6c 69 6e 65 | 73 20 6f 66 20 74 68 65 |NES line|s of the|
|00004ef0| 20 70 72 65 66 69 78 20 | 61 6e 64 20 74 68 65 20 | prefix |and the |
|00004f00| 66 69 72 73 74 20 4c 49 | 4e 45 53 0a 6c 69 6e 65 |first LI|NES.line|
|00004f10| 73 20 6f 66 20 74 68 65 | 20 73 75 66 66 69 78 2e |s of the| suffix.|
|00004f20| 20 20 54 68 69 73 20 67 | 69 76 65 73 20 60 64 69 | This g|ives `di|
|00004f30| 66 66 27 20 66 75 72 74 | 68 65 72 20 6f 70 70 6f |ff' furt|her oppo|
|00004f40| 72 74 75 6e 69 74 69 65 | 73 20 74 6f 20 66 69 6e |rtunitie|s to fin|
|00004f50| 64 20 61 0a 6d 69 6e 69 | 6d 61 6c 20 6f 75 74 70 |d a.mini|mal outp|
|00004f60| 75 74 2e 0a 0a 1f 0a 46 | 69 6c 65 3a 20 64 69 66 |ut.....F|ile: dif|
|00004f70| 66 2e 69 6e 66 6f 2c 20 | 20 4e 6f 64 65 3a 20 43 |f.info, | Node: C|
|00004f80| 6f 6d 70 61 72 69 6e 67 | 20 54 68 72 65 65 20 46 |omparing| Three F|
|00004f90| 69 6c 65 73 2c 20 20 4e | 65 78 74 3a 20 64 69 66 |iles, N|ext: dif|
|00004fa0| 66 33 20 4d 65 72 67 69 | 6e 67 2c 20 20 50 72 65 |f3 Mergi|ng, Pre|
|00004fb0| 76 3a 20 64 69 66 66 20 | 50 65 72 66 6f 72 6d 61 |v: diff |Performa|
|00004fc0| 6e 63 65 2c 20 20 55 70 | 3a 20 54 6f 70 0a 0a 43 |nce, Up|: Top..C|
|00004fd0| 6f 6d 70 61 72 69 6e 67 | 20 54 68 72 65 65 20 46 |omparing| Three F|
|00004fe0| 69 6c 65 73 0a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |iles.***|********|
|00004ff0| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 0a 0a 20 20 20 55 |********|**.. U|
|00005000| 73 65 20 74 68 65 20 70 | 72 6f 67 72 61 6d 20 60 |se the p|rogram `|
|00005010| 64 69 66 66 33 27 20 74 | 6f 20 63 6f 6d 70 61 72 |diff3' t|o compar|
|00005020| 65 20 74 68 72 65 65 20 | 66 69 6c 65 73 20 61 6e |e three |files an|
|00005030| 64 20 73 68 6f 77 20 61 | 6e 79 0a 64 69 66 66 65 |d show a|ny.diffe|
|00005040| 72 65 6e 63 65 73 20 61 | 6d 6f 6e 67 20 74 68 65 |rences a|mong the|
|00005050| 6d 2e 20 20 28 60 64 69 | 66 66 33 27 20 63 61 6e |m. (`di|ff3' can|
|00005060| 20 61 6c 73 6f 20 6d 65 | 72 67 65 20 66 69 6c 65 | also me|rge file|
|00005070| 73 3b 20 73 65 65 20 2a | 4e 6f 74 65 20 64 69 66 |s; see *|Note dif|
|00005080| 66 33 0a 4d 65 72 67 69 | 6e 67 3a 3a 29 2e 0a 0a |f3.Mergi|ng::)...|
|00005090| 20 20 20 54 68 65 20 22 | 6e 6f 72 6d 61 6c 22 20 | The "|normal" |
|000050a0| 60 64 69 66 66 33 27 20 | 6f 75 74 70 75 74 20 66 |`diff3' |output f|
|000050b0| 6f 72 6d 61 74 20 73 68 | 6f 77 73 20 65 61 63 68 |ormat sh|ows each|
|000050c0| 20 68 75 6e 6b 20 6f 66 | 20 64 69 66 66 65 72 65 | hunk of| differe|
|000050d0| 6e 63 65 73 0a 77 69 74 | 68 6f 75 74 20 73 75 72 |nces.wit|hout sur|
|000050e0| 72 6f 75 6e 64 69 6e 67 | 20 63 6f 6e 74 65 78 74 |rounding| context|
|000050f0| 2e 20 20 48 75 6e 6b 73 | 20 61 72 65 20 6c 61 62 |. Hunks| are lab|
|00005100| 65 6c 65 64 20 64 65 70 | 65 6e 64 69 6e 67 20 6f |eled dep|ending o|
|00005110| 6e 20 77 68 65 74 68 65 | 72 0a 74 68 65 79 20 61 |n whethe|r.they a|
|00005120| 72 65 20 74 77 6f 2d 77 | 61 79 20 6f 72 20 74 68 |re two-w|ay or th|
|00005130| 72 65 65 2d 77 61 79 2c | 20 61 6e 64 20 6c 69 6e |ree-way,| and lin|
|00005140| 65 73 20 61 72 65 20 61 | 6e 6e 6f 74 61 74 65 64 |es are a|nnotated|
|00005150| 20 62 79 20 74 68 65 69 | 72 0a 6c 6f 63 61 74 69 | by thei|r.locati|
|00005160| 6f 6e 20 69 6e 20 74 68 | 65 20 69 6e 70 75 74 20 |on in th|e input |
|00005170| 66 69 6c 65 73 2e 0a 0a | 20 20 20 2a 4e 6f 74 65 |files...| *Note|
|00005180| 20 49 6e 76 6f 6b 69 6e | 67 20 64 69 66 66 33 3a | Invokin|g diff3:|
|00005190| 3a 2c 20 66 6f 72 20 6d | 6f 72 65 20 69 6e 66 6f |:, for m|ore info|
|000051a0| 72 6d 61 74 69 6f 6e 20 | 6f 6e 20 68 6f 77 20 74 |rmation |on how t|
|000051b0| 6f 20 72 75 6e 20 60 64 | 69 66 66 33 27 2e 0a 0a |o run `d|iff3'...|
|000051c0| 2a 20 4d 65 6e 75 3a 0a | 0a 2a 20 53 61 6d 70 6c |* Menu:.|.* Sampl|
|000051d0| 65 20 64 69 66 66 33 20 | 49 6e 70 75 74 3a 3a 09 |e diff3 |Input::.|
|000051e0| 09 53 61 6d 70 6c 65 20 | 60 64 69 66 66 33 27 20 |.Sample |`diff3' |
|000051f0| 69 6e 70 75 74 20 66 6f | 72 20 65 78 61 6d 70 6c |input fo|r exampl|
|00005200| 65 73 2e 0a 2a 20 44 65 | 74 61 69 6c 65 64 20 64 |es..* De|tailed d|
|00005210| 69 66 66 33 20 4e 6f 72 | 6d 61 6c 3a 3a 09 41 20 |iff3 Nor|mal::.A |
|00005220| 64 65 74 61 69 6c 65 64 | 20 64 65 73 63 72 69 70 |detailed| descrip|
|00005230| 74 69 6f 6e 20 6f 66 20 | 6e 6f 72 6d 61 6c 20 6f |tion of |normal o|
|00005240| 75 74 70 75 74 20 66 6f | 72 6d 61 74 2e 0a 2a 20 |utput fo|rmat..* |
|00005250| 64 69 66 66 33 20 48 75 | 6e 6b 73 3a 3a 09 09 09 |diff3 Hu|nks::...|
|00005260| 54 68 65 20 66 6f 72 6d | 61 74 20 6f 66 20 6e 6f |The form|at of no|
|00005270| 72 6d 61 6c 20 6f 75 74 | 70 75 74 20 66 6f 72 6d |rmal out|put form|
|00005280| 61 74 2e 0a 2a 20 45 78 | 61 6d 70 6c 65 20 64 69 |at..* Ex|ample di|
|00005290| 66 66 33 20 4e 6f 72 6d | 61 6c 3a 3a 09 53 61 6d |ff3 Norm|al::.Sam|
|000052a0| 70 6c 65 20 6f 75 74 70 | 75 74 20 69 6e 20 74 68 |ple outp|ut in th|
|000052b0| 65 20 6e 6f 72 6d 61 6c | 20 66 6f 72 6d 61 74 2e |e normal| format.|
|000052c0| 0a 0a 1f 0a 46 69 6c 65 | 3a 20 64 69 66 66 2e 69 |....File|: diff.i|
|000052d0| 6e 66 6f 2c 20 20 4e 6f | 64 65 3a 20 53 61 6d 70 |nfo, No|de: Samp|
|000052e0| 6c 65 20 64 69 66 66 33 | 20 49 6e 70 75 74 2c 20 |le diff3| Input, |
|000052f0| 20 4e 65 78 74 3a 20 44 | 65 74 61 69 6c 65 64 20 | Next: D|etailed |
|00005300| 64 69 66 66 33 20 4e 6f | 72 6d 61 6c 2c 20 20 55 |diff3 No|rmal, U|
|00005310| 70 3a 20 43 6f 6d 70 61 | 72 69 6e 67 20 54 68 72 |p: Compa|ring Thr|
|00005320| 65 65 20 46 69 6c 65 73 | 0a 0a 41 20 54 68 69 72 |ee Files|..A Thir|
|00005330| 64 20 53 61 6d 70 6c 65 | 20 49 6e 70 75 74 20 46 |d Sample| Input F|
|00005340| 69 6c 65 0a 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |ile.====|========|
|00005350| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 0a 0a 20 |========|=====.. |
|00005360| 20 20 48 65 72 65 20 69 | 73 20 61 20 74 68 69 72 | Here i|s a thir|
|00005370| 64 20 73 61 6d 70 6c 65 | 20 66 69 6c 65 20 74 68 |d sample| file th|
|00005380| 61 74 20 77 69 6c 6c 20 | 62 65 20 75 73 65 64 20 |at will |be used |
|00005390| 69 6e 20 65 78 61 6d 70 | 6c 65 73 20 74 6f 0a 69 |in examp|les to.i|
|000053a0| 6c 6c 75 73 74 72 61 74 | 65 20 74 68 65 20 6f 75 |llustrat|e the ou|
|000053b0| 74 70 75 74 20 6f 66 20 | 60 64 69 66 66 33 27 20 |tput of |`diff3' |
|000053c0| 61 6e 64 20 68 6f 77 20 | 76 61 72 69 6f 75 73 20 |and how |various |
|000053d0| 6f 70 74 69 6f 6e 73 20 | 63 61 6e 20 63 68 61 6e |options |can chan|
|000053e0| 67 65 20 69 74 2e 0a 54 | 68 65 20 66 69 72 73 74 |ge it..T|he first|
|000053f0| 20 74 77 6f 20 66 69 6c | 65 73 20 61 72 65 20 74 | two fil|es are t|
|00005400| 68 65 20 73 61 6d 65 20 | 74 68 61 74 20 77 65 20 |he same |that we |
|00005410| 75 73 65 64 20 66 6f 72 | 20 60 64 69 66 66 27 20 |used for| `diff' |
|00005420| 28 2a 6e 6f 74 65 20 53 | 61 6d 70 6c 65 0a 64 69 |(*note S|ample.di|
|00005430| 66 66 20 49 6e 70 75 74 | 3a 3a 2e 29 2e 20 20 54 |ff Input|::.). T|
|00005440| 68 69 73 20 69 73 20 74 | 68 65 20 74 68 69 72 64 |his is t|he third|
|00005450| 20 73 61 6d 70 6c 65 20 | 66 69 6c 65 2c 20 63 61 | sample |file, ca|
|00005460| 6c 6c 65 64 20 60 74 61 | 6f 27 3a 0a 0a 20 20 20 |lled `ta|o':.. |
|00005470| 20 20 54 68 65 20 57 61 | 79 20 74 68 61 74 20 63 | The Wa|y that c|
|00005480| 61 6e 20 62 65 20 74 6f | 6c 64 20 6f 66 20 69 73 |an be to|ld of is|
|00005490| 20 6e 6f 74 20 74 68 65 | 20 65 74 65 72 6e 61 6c | not the| eternal|
|000054a0| 20 57 61 79 3b 0a 20 20 | 20 20 20 54 68 65 20 6e | Way;. | The n|
|000054b0| 61 6d 65 20 74 68 61 74 | 20 63 61 6e 20 62 65 20 |ame that| can be |
|000054c0| 6e 61 6d 65 64 20 69 73 | 20 6e 6f 74 20 74 68 65 |named is| not the|
|000054d0| 20 65 74 65 72 6e 61 6c | 20 6e 61 6d 65 2e 0a 20 | eternal| name.. |
|000054e0| 20 20 20 20 54 68 65 20 | 4e 61 6d 65 6c 65 73 73 | The |Nameless|
|000054f0| 20 69 73 20 74 68 65 20 | 6f 72 69 67 69 6e 20 6f | is the |origin o|
|00005500| 66 20 48 65 61 76 65 6e | 20 61 6e 64 20 45 61 72 |f Heaven| and Ear|
|00005510| 74 68 3b 0a 20 20 20 20 | 20 54 68 65 20 6e 61 6d |th;. | The nam|
|00005520| 65 64 20 69 73 20 74 68 | 65 20 6d 6f 74 68 65 72 |ed is th|e mother|
|00005530| 20 6f 66 20 61 6c 6c 20 | 74 68 69 6e 67 73 2e 0a | of all |things..|
|00005540| 20 20 20 20 20 0a 20 20 | 20 20 20 54 68 65 72 65 | . | There|
|00005550| 66 6f 72 65 20 6c 65 74 | 20 74 68 65 72 65 20 61 |fore let| there a|
|00005560| 6c 77 61 79 73 20 62 65 | 20 6e 6f 6e 2d 62 65 69 |lways be| non-bei|
|00005570| 6e 67 2c 0a 20 20 20 20 | 20 20 20 73 6f 20 77 65 |ng,. | so we|
|00005580| 20 6d 61 79 20 73 65 65 | 20 74 68 65 69 72 20 73 | may see| their s|
|00005590| 75 62 74 6c 65 74 79 2c | 0a 20 20 20 20 20 41 6e |ubtlety,|. An|
|000055a0| 64 20 6c 65 74 20 74 68 | 65 72 65 20 61 6c 77 61 |d let th|ere alwa|
|000055b0| 79 73 20 62 65 20 62 65 | 69 6e 67 2c 0a 20 20 20 |ys be be|ing,. |
|000055c0| 20 20 20 20 73 6f 20 77 | 65 20 6d 61 79 20 73 65 | so w|e may se|
|000055d0| 65 20 74 68 65 69 72 20 | 72 65 73 75 6c 74 2e 0a |e their |result..|
|000055e0| 20 20 20 20 20 54 68 65 | 20 74 77 6f 20 61 72 65 | The| two are|
|000055f0| 20 74 68 65 20 73 61 6d | 65 2c 0a 20 20 20 20 20 | the sam|e,. |
|00005600| 42 75 74 20 61 66 74 65 | 72 20 74 68 65 79 20 61 |But afte|r they a|
|00005610| 72 65 20 70 72 6f 64 75 | 63 65 64 2c 0a 20 20 20 |re produ|ced,. |
|00005620| 20 20 20 20 74 68 65 79 | 20 68 61 76 65 20 64 69 | they| have di|
|00005630| 66 66 65 72 65 6e 74 20 | 6e 61 6d 65 73 2e 0a 20 |fferent |names.. |
|00005640| 20 20 20 20 0a 20 20 20 | 20 20 20 20 2d 2d 20 54 | . | -- T|
|00005650| 68 65 20 57 61 79 20 6f | 66 20 4c 61 6f 2d 54 7a |he Way o|f Lao-Tz|
|00005660| 75 2c 20 74 72 2e 20 57 | 69 6e 67 2d 74 73 69 74 |u, tr. W|ing-tsit|
|00005670| 20 43 68 61 6e 0a 0a 1f | 0a 46 69 6c 65 3a 20 64 | Chan...|.File: d|
|00005680| 69 66 66 2e 69 6e 66 6f | 2c 20 20 4e 6f 64 65 3a |iff.info|, Node:|
|00005690| 20 44 65 74 61 69 6c 65 | 64 20 64 69 66 66 33 20 | Detaile|d diff3 |
|000056a0| 4e 6f 72 6d 61 6c 2c 20 | 20 4e 65 78 74 3a 20 64 |Normal, | Next: d|
|000056b0| 69 66 66 33 20 48 75 6e | 6b 73 2c 20 20 50 72 65 |iff3 Hun|ks, Pre|
|000056c0| 76 3a 20 53 61 6d 70 6c | 65 20 64 69 66 66 33 20 |v: Sampl|e diff3 |
|000056d0| 49 6e 70 75 74 2c 20 20 | 55 70 3a 20 43 6f 6d 70 |Input, |Up: Comp|
|000056e0| 61 72 69 6e 67 20 54 68 | 72 65 65 20 46 69 6c 65 |aring Th|ree File|
|000056f0| 73 0a 0a 44 65 74 61 69 | 6c 65 64 20 44 65 73 63 |s..Detai|led Desc|
|00005700| 72 69 70 74 69 6f 6e 20 | 6f 66 20 60 64 69 66 66 |ription |of `diff|
|00005710| 33 27 20 4e 6f 72 6d 61 | 6c 20 46 6f 72 6d 61 74 |3' Norma|l Format|
|00005720| 0a 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |.=======|========|
|00005730| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005740| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 0a 0a |========|======..|
|00005750| 20 20 20 45 61 63 68 20 | 68 75 6e 6b 20 62 65 67 | Each |hunk beg|
|00005760| 69 6e 73 20 77 69 74 68 | 20 61 20 6c 69 6e 65 20 |ins with| a line |
|00005770| 6d 61 72 6b 65 64 20 60 | 3d 3d 3d 3d 27 2e 20 20 |marked `|===='. |
|00005780| 54 68 72 65 65 2d 77 61 | 79 20 68 75 6e 6b 73 20 |Three-wa|y hunks |
|00005790| 68 61 76 65 0a 70 6c 61 | 69 6e 20 60 3d 3d 3d 3d |have.pla|in `====|
|000057a0| 27 20 6c 69 6e 65 73 2c | 20 61 6e 64 20 74 77 6f |' lines,| and two|
|000057b0| 2d 77 61 79 20 68 75 6e | 6b 73 20 68 61 76 65 20 |-way hun|ks have |
|000057c0| 60 31 27 2c 20 60 32 27 | 2c 20 6f 72 20 60 33 27 |`1', `2'|, or `3'|
|000057d0| 20 61 70 70 65 6e 64 65 | 64 20 74 6f 0a 73 70 65 | appende|d to.spe|
|000057e0| 63 69 66 79 20 77 68 69 | 63 68 20 6f 66 20 74 68 |cify whi|ch of th|
|000057f0| 65 20 74 68 72 65 65 20 | 69 6e 70 75 74 20 66 69 |e three |input fi|
|00005800| 6c 65 73 20 64 69 66 66 | 65 72 20 69 6e 20 74 68 |les diff|er in th|
|00005810| 61 74 20 68 75 6e 6b 2e | 20 20 54 68 65 20 68 75 |at hunk.| The hu|
|00005820| 6e 6b 73 0a 63 6f 6e 74 | 61 69 6e 20 63 6f 70 69 |nks.cont|ain copi|
|00005830| 65 73 20 6f 66 20 74 77 | 6f 20 6f 72 20 74 68 72 |es of tw|o or thr|
|00005840| 65 65 20 73 65 74 73 20 | 6f 66 20 69 6e 70 75 74 |ee sets |of input|
|00005850| 20 6c 69 6e 65 73 20 65 | 61 63 68 20 70 72 65 63 | lines e|ach prec|
|00005860| 65 64 65 64 20 62 79 20 | 6f 6e 65 0a 6f 72 20 74 |eded by |one.or t|
|00005870| 77 6f 20 63 6f 6d 6d 61 | 6e 64 73 20 69 64 65 6e |wo comma|nds iden|
|00005880| 74 69 66 79 69 6e 67 20 | 77 68 65 72 65 20 74 68 |tifying |where th|
|00005890| 65 20 6c 69 6e 65 73 20 | 63 61 6d 65 20 66 72 6f |e lines |came fro|
|000058a0| 6d 2e 0a 0a 20 20 20 4e | 6f 72 6d 61 6c 6c 79 2c |m... N|ormally,|
|000058b0| 20 74 77 6f 20 73 70 61 | 63 65 73 20 70 72 65 63 | two spa|ces prec|
|000058c0| 65 64 65 20 65 61 63 68 | 20 63 6f 70 79 20 6f 66 |ede each| copy of|
|000058d0| 20 61 6e 20 69 6e 70 75 | 74 20 6c 69 6e 65 20 74 | an inpu|t line t|
|000058e0| 6f 0a 64 69 73 74 69 6e | 67 75 69 73 68 20 69 74 |o.distin|guish it|
|000058f0| 20 66 72 6f 6d 20 74 68 | 65 20 63 6f 6d 6d 61 6e | from th|e comman|
|00005900| 64 73 2e 20 20 42 75 74 | 20 77 69 74 68 20 74 68 |ds. But| with th|
|00005910| 65 20 60 2d 54 27 20 6f | 72 20 60 2d 2d 69 6e 69 |e `-T' o|r `--ini|
|00005920| 74 69 61 6c 2d 74 61 62 | 27 0a 6f 70 74 69 6f 6e |tial-tab|'.option|
|00005930| 2c 20 60 64 69 66 66 33 | 27 20 75 73 65 73 20 61 |, `diff3|' uses a|
|00005940| 20 74 61 62 20 69 6e 73 | 74 65 61 64 20 6f 66 20 | tab ins|tead of |
|00005950| 74 77 6f 20 73 70 61 63 | 65 73 3b 20 74 68 69 73 |two spac|es; this|
|00005960| 20 6c 69 6e 65 73 20 75 | 70 20 74 61 62 73 0a 63 | lines u|p tabs.c|
|00005970| 6f 72 72 65 63 74 6c 79 | 2e 20 20 2a 4e 6f 74 65 |orrectly|. *Note|
|00005980| 20 54 61 62 73 3a 3a 2c | 20 66 6f 72 20 6d 6f 72 | Tabs::,| for mor|
|00005990| 65 20 69 6e 66 6f 72 6d | 61 74 69 6f 6e 2e 0a 0a |e inform|ation...|
|000059a0| 20 20 20 43 6f 6d 6d 61 | 6e 64 73 20 74 61 6b 65 | Comma|nds take|
|000059b0| 20 74 68 65 20 66 6f 6c | 6c 6f 77 69 6e 67 20 66 | the fol|lowing f|
|000059c0| 6f 72 6d 73 3a 0a 0a 60 | 46 49 4c 45 3a 4c 61 27 |orms:..`|FILE:La'|
|000059d0| 0a 20 20 20 20 20 54 68 | 69 73 20 68 75 6e 6b 20 |. Th|is hunk |
|000059e0| 61 70 70 65 61 72 73 20 | 61 66 74 65 72 20 6c 69 |appears |after li|
|000059f0| 6e 65 20 4c 20 6f 66 20 | 66 69 6c 65 20 46 49 4c |ne L of |file FIL|
|00005a00| 45 2c 20 61 6e 64 20 63 | 6f 6e 74 61 69 6e 73 20 |E, and c|ontains |
|00005a10| 6e 6f 20 6c 69 6e 65 73 | 0a 20 20 20 20 20 69 6e |no lines|. in|
|00005a20| 20 74 68 61 74 20 66 69 | 6c 65 2e 20 20 54 6f 20 | that fi|le. To |
|00005a30| 65 64 69 74 20 74 68 69 | 73 20 66 69 6c 65 20 74 |edit thi|s file t|
|00005a40| 6f 20 79 69 65 6c 64 20 | 74 68 65 20 6f 74 68 65 |o yield |the othe|
|00005a50| 72 20 66 69 6c 65 73 2c | 20 6f 6e 65 0a 20 20 20 |r files,| one. |
|00005a60| 20 20 6d 75 73 74 20 61 | 70 70 65 6e 64 20 68 75 | must a|ppend hu|
|00005a70| 6e 6b 20 6c 69 6e 65 73 | 20 74 61 6b 65 6e 20 66 |nk lines| taken f|
|00005a80| 72 6f 6d 20 74 68 65 20 | 6f 74 68 65 72 20 66 69 |rom the |other fi|
|00005a90| 6c 65 73 2e 20 20 46 6f | 72 20 65 78 61 6d 70 6c |les. Fo|r exampl|
|00005aa0| 65 2c 0a 20 20 20 20 20 | 60 31 3a 31 31 61 27 20 |e,. |`1:11a' |
|00005ab0| 6d 65 61 6e 73 20 74 68 | 61 74 20 74 68 65 20 68 |means th|at the h|
|00005ac0| 75 6e 6b 20 66 6f 6c 6c | 6f 77 73 20 6c 69 6e 65 |unk foll|ows line|
|00005ad0| 20 31 31 20 69 6e 20 74 | 68 65 20 66 69 72 73 74 | 11 in t|he first|
|00005ae0| 20 66 69 6c 65 20 61 6e | 64 0a 20 20 20 20 20 63 | file an|d. c|
|00005af0| 6f 6e 74 61 69 6e 73 20 | 6e 6f 20 6c 69 6e 65 73 |ontains |no lines|
|00005b00| 20 66 72 6f 6d 20 74 68 | 61 74 20 66 69 6c 65 2e | from th|at file.|
|00005b10| 0a 0a 60 46 49 4c 45 3a | 52 63 27 0a 20 20 20 20 |..`FILE:|Rc'. |
|00005b20| 20 54 68 69 73 20 68 75 | 6e 6b 20 63 6f 6e 74 61 | This hu|nk conta|
|00005b30| 69 6e 73 20 74 68 65 20 | 6c 69 6e 65 73 20 69 6e |ins the |lines in|
|00005b40| 20 74 68 65 20 72 61 6e | 67 65 20 52 20 6f 66 20 | the ran|ge R of |
|00005b50| 66 69 6c 65 20 46 49 4c | 45 2e 20 20 54 68 65 0a |file FIL|E. The.|
|00005b60| 20 20 20 20 20 72 61 6e | 67 65 20 52 20 69 73 20 | ran|ge R is |
|00005b70| 61 20 63 6f 6d 6d 61 2d | 73 65 70 61 72 61 74 65 |a comma-|separate|
|00005b80| 64 20 70 61 69 72 20 6f | 66 20 6c 69 6e 65 20 6e |d pair o|f line n|
|00005b90| 75 6d 62 65 72 73 2c 20 | 6f 72 20 6a 75 73 74 20 |umbers, |or just |
|00005ba0| 6f 6e 65 0a 20 20 20 20 | 20 6e 75 6d 62 65 72 20 |one. | number |
|00005bb0| 69 66 20 74 68 65 20 72 | 61 6e 67 65 20 69 73 20 |if the r|ange is |
|00005bc0| 61 20 73 69 6e 67 6c 65 | 74 6f 6e 2e 20 20 54 6f |a single|ton. To|
|00005bd0| 20 65 64 69 74 20 74 68 | 69 73 20 66 69 6c 65 20 | edit th|is file |
|00005be0| 74 6f 20 79 69 65 6c 64 | 20 74 68 65 0a 20 20 20 |to yield| the. |
|00005bf0| 20 20 6f 74 68 65 72 20 | 66 69 6c 65 73 2c 20 6f | other |files, o|
|00005c00| 6e 65 20 6d 75 73 74 20 | 63 68 61 6e 67 65 20 74 |ne must |change t|
|00005c10| 68 65 20 73 70 65 63 69 | 66 69 65 64 20 6c 69 6e |he speci|fied lin|
|00005c20| 65 73 20 74 6f 20 62 65 | 20 74 68 65 20 6c 69 6e |es to be| the lin|
|00005c30| 65 73 0a 20 20 20 20 20 | 74 61 6b 65 6e 20 66 72 |es. |taken fr|
|00005c40| 6f 6d 20 74 68 65 20 6f | 74 68 65 72 20 66 69 6c |om the o|ther fil|
|00005c50| 65 73 2e 20 20 46 6f 72 | 20 65 78 61 6d 70 6c 65 |es. For| example|
|00005c60| 2c 20 60 32 3a 31 31 2c | 31 33 63 27 20 6d 65 61 |, `2:11,|13c' mea|
|00005c70| 6e 73 20 74 68 61 74 0a | 20 20 20 20 20 74 68 65 |ns that.| the|
|00005c80| 20 68 75 6e 6b 20 63 6f | 6e 74 61 69 6e 73 20 6c | hunk co|ntains l|
|00005c90| 69 6e 65 73 20 31 31 20 | 74 68 72 6f 75 67 68 20 |ines 11 |through |
|00005ca0| 31 33 20 66 72 6f 6d 20 | 74 68 65 20 73 65 63 6f |13 from |the seco|
|00005cb0| 6e 64 20 66 69 6c 65 2e | 0a 0a 20 20 20 49 66 20 |nd file.|.. If |
|00005cc0| 74 68 65 20 6c 61 73 74 | 20 6c 69 6e 65 20 69 6e |the last| line in|
|00005cd0| 20 61 20 73 65 74 20 6f | 66 20 69 6e 70 75 74 20 | a set o|f input |
|00005ce0| 6c 69 6e 65 73 20 69 73 | 20 69 6e 63 6f 6d 70 6c |lines is| incompl|
|00005cf0| 65 74 65 20 28 2a 6e 6f | 74 65 0a 49 6e 63 6f 6d |ete (*no|te.Incom|
|00005d00| 70 6c 65 74 65 20 4c 69 | 6e 65 73 3a 3a 2e 29 2c |plete Li|nes::.),|
|00005d10| 20 69 74 20 69 73 20 64 | 69 73 74 69 6e 67 75 69 | it is d|istingui|
|00005d20| 73 68 65 64 20 6f 6e 20 | 6f 75 74 70 75 74 20 66 |shed on |output f|
|00005d30| 72 6f 6d 20 61 20 66 75 | 6c 6c 20 6c 69 6e 65 20 |rom a fu|ll line |
|00005d40| 62 79 0a 61 20 66 6f 6c | 6c 6f 77 69 6e 67 20 6c |by.a fol|lowing l|
|00005d50| 69 6e 65 20 74 68 61 74 | 20 73 74 61 72 74 73 20 |ine that| starts |
|00005d60| 77 69 74 68 20 60 5c 27 | 2e 0a 0a 1f 0a 46 69 6c |with `\'|.....Fil|
|00005d70| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|00005d80| 6f 64 65 3a 20 64 69 66 | 66 33 20 48 75 6e 6b 73 |ode: dif|f3 Hunks|
|00005d90| 2c 20 20 4e 65 78 74 3a | 20 45 78 61 6d 70 6c 65 |, Next:| Example|
|00005da0| 20 64 69 66 66 33 20 4e | 6f 72 6d 61 6c 2c 20 20 | diff3 N|ormal, |
|00005db0| 50 72 65 76 3a 20 44 65 | 74 61 69 6c 65 64 20 64 |Prev: De|tailed d|
|00005dc0| 69 66 66 33 20 4e 6f 72 | 6d 61 6c 2c 20 20 55 70 |iff3 Nor|mal, Up|
|00005dd0| 3a 20 43 6f 6d 70 61 72 | 69 6e 67 20 54 68 72 65 |: Compar|ing Thre|
|00005de0| 65 20 46 69 6c 65 73 0a | 0a 60 64 69 66 66 33 27 |e Files.|.`diff3'|
|00005df0| 20 48 75 6e 6b 73 0a 3d | 3d 3d 3d 3d 3d 3d 3d 3d | Hunks.=|========|
|00005e00| 3d 3d 3d 3d 0a 0a 20 20 | 20 47 72 6f 75 70 73 20 |====.. | Groups |
|00005e10| 6f 66 20 6c 69 6e 65 73 | 20 74 68 61 74 20 64 69 |of lines| that di|
|00005e20| 66 66 65 72 20 69 6e 20 | 74 77 6f 20 6f 72 20 74 |ffer in |two or t|
|00005e30| 68 72 65 65 20 6f 66 20 | 74 68 65 20 69 6e 70 75 |hree of |the inpu|
|00005e40| 74 20 66 69 6c 65 73 20 | 61 72 65 0a 63 61 6c 6c |t files |are.call|
|00005e50| 65 64 20 22 64 69 66 66 | 33 20 68 75 6e 6b 73 22 |ed "diff|3 hunks"|
|00005e60| 2c 20 62 79 20 61 6e 61 | 6c 6f 67 79 20 77 69 74 |, by ana|logy wit|
|00005e70| 68 20 60 64 69 66 66 27 | 20 68 75 6e 6b 73 20 28 |h `diff'| hunks (|
|00005e80| 2a 6e 6f 74 65 20 48 75 | 6e 6b 73 3a 3a 2e 29 2e |*note Hu|nks::.).|
|00005e90| 0a 49 66 20 61 6c 6c 20 | 74 68 72 65 65 20 69 6e |.If all |three in|
|00005ea0| 70 75 74 20 66 69 6c 65 | 73 20 64 69 66 66 65 72 |put file|s differ|
|00005eb0| 20 69 6e 20 61 20 60 64 | 69 66 66 33 27 20 68 75 | in a `d|iff3' hu|
|00005ec0| 6e 6b 2c 20 74 68 65 20 | 68 75 6e 6b 20 69 73 20 |nk, the |hunk is |
|00005ed0| 63 61 6c 6c 65 64 20 61 | 0a 22 74 68 72 65 65 2d |called a|."three-|
|00005ee0| 77 61 79 20 68 75 6e 6b | 22 3b 20 69 66 20 6a 75 |way hunk|"; if ju|
|00005ef0| 73 74 20 74 77 6f 20 69 | 6e 70 75 74 20 66 69 6c |st two i|nput fil|
|00005f00| 65 73 20 64 69 66 66 65 | 72 2c 20 69 74 20 69 73 |es diffe|r, it is|
|00005f10| 20 61 20 22 74 77 6f 2d | 77 61 79 0a 68 75 6e 6b | a "two-|way.hunk|
|00005f20| 22 2e 0a 0a 20 20 20 41 | 73 20 77 69 74 68 20 60 |"... A|s with `|
|00005f30| 64 69 66 66 27 2c 20 73 | 65 76 65 72 61 6c 20 73 |diff', s|everal s|
|00005f40| 6f 6c 75 74 69 6f 6e 73 | 20 61 72 65 20 70 6f 73 |olutions| are pos|
|00005f50| 73 69 62 6c 65 2e 20 20 | 57 68 65 6e 20 63 6f 6d |sible. |When com|
|00005f60| 70 61 72 69 6e 67 20 74 | 68 65 0a 66 69 6c 65 73 |paring t|he.files|
|00005f70| 20 60 41 27 2c 20 60 42 | 27 2c 20 61 6e 64 20 60 | `A', `B|', and `|
|00005f80| 43 27 2c 20 60 64 69 66 | 66 33 27 20 6e 6f 72 6d |C', `dif|f3' norm|
|00005f90| 61 6c 6c 79 20 66 69 6e | 64 73 20 60 64 69 66 66 |ally fin|ds `diff|
|00005fa0| 33 27 20 68 75 6e 6b 73 | 20 62 79 0a 6d 65 72 67 |3' hunks| by.merg|
|00005fb0| 69 6e 67 20 74 68 65 20 | 74 77 6f 2d 77 61 79 20 |ing the |two-way |
|00005fc0| 68 75 6e 6b 73 20 6f 75 | 74 70 75 74 20 62 79 20 |hunks ou|tput by |
|00005fd0| 74 68 65 20 74 77 6f 20 | 63 6f 6d 6d 61 6e 64 73 |the two |commands|
|00005fe0| 20 60 64 69 66 66 20 41 | 20 42 27 20 61 6e 64 0a | `diff A| B' and.|
|00005ff0| 60 64 69 66 66 20 41 20 | 43 27 2e 20 20 54 68 69 |`diff A |C'. Thi|
|00006000| 73 20 64 6f 65 73 20 6e | 6f 74 20 6e 65 63 65 73 |s does n|ot neces|
|00006010| 73 61 72 69 6c 79 20 6d | 69 6e 69 6d 69 7a 65 20 |sarily m|inimize |
|00006020| 74 68 65 20 73 69 7a 65 | 20 6f 66 20 74 68 65 20 |the size| of the |
|00006030| 6f 75 74 70 75 74 2c 0a | 62 75 74 20 65 78 63 65 |output,.|but exce|
|00006040| 70 74 69 6f 6e 73 20 73 | 68 6f 75 6c 64 20 62 65 |ptions s|hould be|
|00006050| 20 72 61 72 65 2e 0a 0a | 20 20 20 46 6f 72 20 65 | rare...| For e|
|00006060| 78 61 6d 70 6c 65 2c 20 | 73 75 70 70 6f 73 65 20 |xample, |suppose |
|00006070| 60 46 27 20 63 6f 6e 74 | 61 69 6e 73 20 74 68 65 |`F' cont|ains the|
|00006080| 20 74 68 72 65 65 20 6c | 69 6e 65 73 20 60 61 27 | three l|ines `a'|
|00006090| 2c 20 60 62 27 2c 20 60 | 66 27 2c 20 60 47 27 0a |, `b', `|f', `G'.|
|000060a0| 63 6f 6e 74 61 69 6e 73 | 20 74 68 65 20 6c 69 6e |contains| the lin|
|000060b0| 65 73 20 60 67 27 2c 20 | 60 62 27 2c 20 60 67 27 |es `g', |`b', `g'|
|000060c0| 2c 20 61 6e 64 20 60 48 | 27 20 63 6f 6e 74 61 69 |, and `H|' contai|
|000060d0| 6e 73 20 74 68 65 20 6c | 69 6e 65 73 20 60 61 27 |ns the l|ines `a'|
|000060e0| 2c 20 60 62 27 2c 0a 60 | 68 27 2e 20 20 60 64 69 |, `b',.`|h'. `di|
|000060f0| 66 66 33 20 46 20 47 20 | 48 27 20 6d 69 67 68 74 |ff3 F G |H' might|
|00006100| 20 6f 75 74 70 75 74 20 | 74 68 65 20 66 6f 6c 6c | output |the foll|
|00006110| 6f 77 69 6e 67 3a 0a 0a | 20 20 20 20 20 3d 3d 3d |owing:..| ===|
|00006120| 3d 32 0a 20 20 20 20 20 | 31 3a 31 63 0a 20 20 20 |=2. |1:1c. |
|00006130| 20 20 33 3a 31 63 0a 20 | 20 20 20 20 20 20 61 0a | 3:1c. | a.|
|00006140| 20 20 20 20 20 32 3a 31 | 63 0a 20 20 20 20 20 20 | 2:1|c. |
|00006150| 20 67 0a 20 20 20 20 20 | 3d 3d 3d 3d 0a 20 20 20 | g. |====. |
|00006160| 20 20 31 3a 33 63 0a 20 | 20 20 20 20 20 20 66 0a | 1:3c. | f.|
|00006170| 20 20 20 20 20 32 3a 33 | 63 0a 20 20 20 20 20 20 | 2:3|c. |
|00006180| 20 67 0a 20 20 20 20 20 | 33 3a 33 63 0a 20 20 20 | g. |3:3c. |
|00006190| 20 20 20 20 68 0a 0a 62 | 65 63 61 75 73 65 20 69 | h..b|ecause i|
|000061a0| 74 20 66 6f 75 6e 64 20 | 61 20 74 77 6f 2d 77 61 |t found |a two-wa|
|000061b0| 79 20 68 75 6e 6b 20 63 | 6f 6e 74 61 69 6e 69 6e |y hunk c|ontainin|
|000061c0| 67 20 60 61 27 20 69 6e | 20 74 68 65 20 66 69 72 |g `a' in| the fir|
|000061d0| 73 74 20 61 6e 64 20 74 | 68 69 72 64 0a 66 69 6c |st and t|hird.fil|
|000061e0| 65 73 20 61 6e 64 20 60 | 67 27 20 69 6e 20 74 68 |es and `|g' in th|
|000061f0| 65 20 73 65 63 6f 6e 64 | 20 66 69 6c 65 2c 20 74 |e second| file, t|
|00006200| 68 65 6e 20 74 68 65 20 | 73 69 6e 67 6c 65 20 6c |hen the |single l|
|00006210| 69 6e 65 20 60 62 27 20 | 63 6f 6d 6d 6f 6e 20 74 |ine `b' |common t|
|00006220| 6f 0a 61 6c 6c 20 74 68 | 72 65 65 20 66 69 6c 65 |o.all th|ree file|
|00006230| 73 2c 20 74 68 65 6e 20 | 61 20 74 68 72 65 65 2d |s, then |a three-|
|00006240| 77 61 79 20 68 75 6e 6b | 20 63 6f 6e 74 61 69 6e |way hunk| contain|
|00006250| 69 6e 67 20 74 68 65 20 | 6c 61 73 74 20 6c 69 6e |ing the |last lin|
|00006260| 65 20 6f 66 20 65 61 63 | 68 0a 66 69 6c 65 2e 0a |e of eac|h.file..|
|00006270| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|00006280| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 45 78 61 6d 70 |fo, Nod|e: Examp|
|00006290| 6c 65 20 64 69 66 66 33 | 20 4e 6f 72 6d 61 6c 2c |le diff3| Normal,|
|000062a0| 20 20 50 72 65 76 3a 20 | 64 69 66 66 33 20 48 75 | Prev: |diff3 Hu|
|000062b0| 6e 6b 73 2c 20 20 55 70 | 3a 20 43 6f 6d 70 61 72 |nks, Up|: Compar|
|000062c0| 69 6e 67 20 54 68 72 65 | 65 20 46 69 6c 65 73 0a |ing Thre|e Files.|
|000062d0| 0a 41 6e 20 45 78 61 6d | 70 6c 65 20 6f 66 20 60 |.An Exam|ple of `|
|000062e0| 64 69 66 66 33 27 20 4e | 6f 72 6d 61 6c 20 46 6f |diff3' N|ormal Fo|
|000062f0| 72 6d 61 74 0a 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |rmat.===|========|
|00006300| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006310| 3d 3d 3d 3d 3d 3d 3d 3d | 0a 0a 20 20 20 48 65 72 |========|.. Her|
|00006320| 65 20 69 73 20 74 68 65 | 20 6f 75 74 70 75 74 20 |e is the| output |
|00006330| 6f 66 20 74 68 65 20 63 | 6f 6d 6d 61 6e 64 20 60 |of the c|ommand `|
|00006340| 64 69 66 66 33 20 6c 61 | 6f 20 74 7a 75 20 74 61 |diff3 la|o tzu ta|
|00006350| 6f 27 20 28 2a 6e 6f 74 | 65 20 53 61 6d 70 6c 65 |o' (*not|e Sample|
|00006360| 0a 64 69 66 66 33 20 49 | 6e 70 75 74 3a 3a 2e 2c |.diff3 I|nput::.,|
|00006370| 20 66 6f 72 20 74 68 65 | 20 63 6f 6d 70 6c 65 74 | for the| complet|
|00006380| 65 20 63 6f 6e 74 65 6e | 74 73 20 6f 66 20 74 68 |e conten|ts of th|
|00006390| 65 20 66 69 6c 65 73 29 | 2e 20 20 4e 6f 74 69 63 |e files)|. Notic|
|000063a0| 65 20 74 68 61 74 0a 69 | 74 20 73 68 6f 77 73 20 |e that.i|t shows |
|000063b0| 6f 6e 6c 79 20 74 68 65 | 20 6c 69 6e 65 73 20 74 |only the| lines t|
|000063c0| 68 61 74 20 61 72 65 20 | 64 69 66 66 65 72 65 6e |hat are |differen|
|000063d0| 74 20 61 6d 6f 6e 67 20 | 74 68 65 20 74 68 72 65 |t among |the thre|
|000063e0| 65 20 66 69 6c 65 73 2e | 0a 0a 20 20 20 20 20 3d |e files.|.. =|
|000063f0| 3d 3d 3d 32 0a 20 20 20 | 20 20 31 3a 31 2c 32 63 |===2. | 1:1,2c|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
