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 36 34 20 66 | 72 6f 6d 20 74 68 65 20 |o-1.64 f|rom the |
|00000040| 69 6e 70 75 74 0a 66 69 | 6c 65 20 2f 61 64 65 2d |input.fi|le /ade-|
|00000050| 73 72 63 2f 66 73 66 2f | 64 69 66 66 75 74 69 6c |src/fsf/|diffutil|
|00000060| 73 2f 64 69 66 66 2e 74 | 65 78 69 2e 0a 0a 20 20 |s/diff.t|exi... |
|00000070| 20 54 68 69 73 20 66 69 | 6c 65 20 64 6f 63 75 6d | This fi|le docum|
|00000080| 65 6e 74 73 20 74 68 65 | 20 74 68 65 20 47 4e 55 |ents the| the GNU|
|00000090| 20 60 64 69 66 66 27 2c | 20 60 64 69 66 66 33 27 | `diff',| `diff3'|
|000000a0| 2c 20 60 73 64 69 66 66 | 27 2c 20 61 6e 64 20 60 |, `sdiff|', and `|
|000000b0| 63 6d 70 27 0a 63 6f 6d | 6d 61 6e 64 73 20 66 6f |cmp'.com|mands fo|
|000000c0| 72 20 73 68 6f 77 69 6e | 67 20 74 68 65 20 64 69 |r showin|g the di|
|000000d0| 66 66 65 72 65 6e 63 65 | 73 20 62 65 74 77 65 65 |fference|s betwee|
|000000e0| 6e 20 74 65 78 74 20 66 | 69 6c 65 73 20 61 6e 64 |n text f|iles and|
|000000f0| 20 74 68 65 20 60 70 61 | 74 63 68 27 0a 63 6f 6d | the `pa|tch'.com|
|00000100| 6d 61 6e 64 20 66 6f 72 | 20 75 73 69 6e 67 20 74 |mand for| using t|
|00000110| 68 65 69 72 20 6f 75 74 | 70 75 74 20 74 6f 20 75 |heir out|put to u|
|00000120| 70 64 61 74 65 20 66 69 | 6c 65 73 2e 0a 0a 20 20 |pdate fi|les... |
|00000130| 20 43 6f 70 79 72 69 67 | 68 74 20 28 43 29 20 31 | Copyrig|ht (C) 1|
|00000140| 39 39 32 2c 20 31 39 39 | 33 2c 20 31 39 39 34 20 |992, 199|3, 1994 |
|00000150| 46 72 65 65 20 53 6f 66 | 74 77 61 72 65 20 46 6f |Free Sof|tware Fo|
|00000160| 75 6e 64 61 74 69 6f 6e | 2c 20 49 6e 63 2e 0a 0a |undation|, Inc...|
|00000170| 20 20 20 50 65 72 6d 69 | 73 73 69 6f 6e 20 69 73 | Permi|ssion is|
|00000180| 20 67 72 61 6e 74 65 64 | 20 74 6f 20 6d 61 6b 65 | granted| to make|
|00000190| 20 61 6e 64 20 64 69 73 | 74 72 69 62 75 74 65 20 | and dis|tribute |
|000001a0| 76 65 72 62 61 74 69 6d | 20 63 6f 70 69 65 73 20 |verbatim| copies |
|000001b0| 6f 66 20 74 68 69 73 0a | 6d 61 6e 75 61 6c 20 70 |of this.|manual p|
|000001c0| 72 6f 76 69 64 65 64 20 | 74 68 65 20 63 6f 70 79 |rovided |the copy|
|000001d0| 72 69 67 68 74 20 6e 6f | 74 69 63 65 20 61 6e 64 |right no|tice and|
|000001e0| 20 74 68 69 73 20 70 65 | 72 6d 69 73 73 69 6f 6e | this pe|rmission|
|000001f0| 20 6e 6f 74 69 63 65 20 | 61 72 65 0a 70 72 65 73 | notice |are.pres|
|00000200| 65 72 76 65 64 20 6f 6e | 20 61 6c 6c 20 63 6f 70 |erved on| all cop|
|00000210| 69 65 73 2e 0a 0a 20 20 | 20 50 65 72 6d 69 73 73 |ies... | Permiss|
|00000220| 69 6f 6e 20 69 73 20 67 | 72 61 6e 74 65 64 20 74 |ion is g|ranted t|
|00000230| 6f 20 63 6f 70 79 20 61 | 6e 64 20 64 69 73 74 72 |o copy a|nd distr|
|00000240| 69 62 75 74 65 20 6d 6f | 64 69 66 69 65 64 20 76 |ibute mo|dified v|
|00000250| 65 72 73 69 6f 6e 73 20 | 6f 66 0a 74 68 69 73 20 |ersions |of.this |
|00000260| 6d 61 6e 75 61 6c 20 75 | 6e 64 65 72 20 74 68 65 |manual u|nder the|
|00000270| 20 63 6f 6e 64 69 74 69 | 6f 6e 73 20 66 6f 72 20 | conditi|ons for |
|00000280| 76 65 72 62 61 74 69 6d | 20 63 6f 70 79 69 6e 67 |verbatim| copying|
|00000290| 2c 20 70 72 6f 76 69 64 | 65 64 20 74 68 61 74 0a |, provid|ed that.|
|000002a0| 74 68 65 20 65 6e 74 69 | 72 65 20 72 65 73 75 6c |the enti|re resul|
|000002b0| 74 69 6e 67 20 64 65 72 | 69 76 65 64 20 77 6f 72 |ting der|ived wor|
|000002c0| 6b 20 69 73 20 64 69 73 | 74 72 69 62 75 74 65 64 |k is dis|tributed|
|000002d0| 20 75 6e 64 65 72 20 74 | 68 65 20 74 65 72 6d 73 | under t|he terms|
|000002e0| 20 6f 66 20 61 0a 70 65 | 72 6d 69 73 73 69 6f 6e | of a.pe|rmission|
|000002f0| 20 6e 6f 74 69 63 65 20 | 69 64 65 6e 74 69 63 61 | notice |identica|
|00000300| 6c 20 74 6f 20 74 68 69 | 73 20 6f 6e 65 2e 0a 0a |l to thi|s one...|
|00000310| 20 20 20 50 65 72 6d 69 | 73 73 69 6f 6e 20 69 73 | Permi|ssion is|
|00000320| 20 67 72 61 6e 74 65 64 | 20 74 6f 20 63 6f 70 79 | granted| to copy|
|00000330| 20 61 6e 64 20 64 69 73 | 74 72 69 62 75 74 65 20 | and dis|tribute |
|00000340| 74 72 61 6e 73 6c 61 74 | 69 6f 6e 73 20 6f 66 20 |translat|ions of |
|00000350| 74 68 69 73 0a 6d 61 6e | 75 61 6c 20 69 6e 74 6f |this.man|ual into|
|00000360| 20 61 6e 6f 74 68 65 72 | 20 6c 61 6e 67 75 61 67 | another| languag|
|00000370| 65 2c 20 75 6e 64 65 72 | 20 74 68 65 20 61 62 6f |e, under| the abo|
|00000380| 76 65 20 63 6f 6e 64 69 | 74 69 6f 6e 73 20 66 6f |ve condi|tions fo|
|00000390| 72 20 6d 6f 64 69 66 69 | 65 64 0a 76 65 72 73 69 |r modifi|ed.versi|
|000003a0| 6f 6e 73 2c 20 65 78 63 | 65 70 74 20 74 68 61 74 |ons, exc|ept that|
|000003b0| 20 74 68 69 73 20 70 65 | 72 6d 69 73 73 69 6f 6e | this pe|rmission|
|000003c0| 20 6e 6f 74 69 63 65 20 | 6d 61 79 20 62 65 20 73 | notice |may be s|
|000003d0| 74 61 74 65 64 20 69 6e | 20 61 0a 74 72 61 6e 73 |tated in| a.trans|
|000003e0| 6c 61 74 69 6f 6e 20 61 | 70 70 72 6f 76 65 64 20 |lation a|pproved |
|000003f0| 62 79 20 74 68 65 20 46 | 6f 75 6e 64 61 74 69 6f |by the F|oundatio|
|00000400| 6e 2e 0a 0a 1f 0a 46 69 | 6c 65 3a 20 64 69 66 66 |n.....Fi|le: diff|
|00000410| 2e 69 6e 66 6f 2c 20 20 | 4e 6f 64 65 3a 20 4c 69 |.info, |Node: Li|
|00000420| 6e 65 20 47 72 6f 75 70 | 20 46 6f 72 6d 61 74 73 |ne Group| Formats|
|00000430| 2c 20 20 4e 65 78 74 3a | 20 4c 69 6e 65 20 46 6f |, Next:| Line Fo|
|00000440| 72 6d 61 74 73 2c 20 20 | 55 70 3a 20 49 66 2d 74 |rmats, |Up: If-t|
|00000450| 68 65 6e 2d 65 6c 73 65 | 0a 0a 4c 69 6e 65 20 47 |hen-else|..Line G|
|00000460| 72 6f 75 70 20 46 6f 72 | 6d 61 74 73 0a 2d 2d 2d |roup For|mats.---|
|00000470| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 0a |--------|-------.|
|00000480| 0a 20 20 20 4c 69 6e 65 | 20 67 72 6f 75 70 20 66 |. Line| group f|
|00000490| 6f 72 6d 61 74 73 20 6c | 65 74 20 79 6f 75 20 73 |ormats l|et you s|
|000004a0| 70 65 63 69 66 79 20 66 | 6f 72 6d 61 74 73 20 73 |pecify f|ormats s|
|000004b0| 75 69 74 61 62 6c 65 20 | 66 6f 72 20 6d 61 6e 79 |uitable |for many|
|000004c0| 0a 61 70 70 6c 69 63 61 | 74 69 6f 6e 73 20 74 68 |.applica|tions th|
|000004d0| 61 74 20 61 6c 6c 6f 77 | 20 69 66 2d 74 68 65 6e |at allow| if-then|
|000004e0| 2d 65 6c 73 65 20 69 6e | 70 75 74 2c 20 69 6e 63 |-else in|put, inc|
|000004f0| 6c 75 64 69 6e 67 20 70 | 72 6f 67 72 61 6d 6d 69 |luding p|rogrammi|
|00000500| 6e 67 0a 6c 61 6e 67 75 | 61 67 65 73 20 61 6e 64 |ng.langu|ages and|
|00000510| 20 74 65 78 74 20 66 6f | 72 6d 61 74 74 69 6e 67 | text fo|rmatting|
|00000520| 20 6c 61 6e 67 75 61 67 | 65 73 2e 20 20 41 20 6c | languag|es. A l|
|00000530| 69 6e 65 20 67 72 6f 75 | 70 20 66 6f 72 6d 61 74 |ine grou|p format|
|00000540| 20 73 70 65 63 69 66 69 | 65 73 0a 74 68 65 20 6f | specifi|es.the o|
|00000550| 75 74 70 75 74 20 66 6f | 72 6d 61 74 20 66 6f 72 |utput fo|rmat for|
|00000560| 20 61 20 63 6f 6e 74 69 | 67 75 6f 75 73 20 67 72 | a conti|guous gr|
|00000570| 6f 75 70 20 6f 66 20 73 | 69 6d 69 6c 61 72 20 6c |oup of s|imilar l|
|00000580| 69 6e 65 73 2e 0a 0a 20 | 20 20 46 6f 72 20 65 78 |ines... | For ex|
|00000590| 61 6d 70 6c 65 2c 20 74 | 68 65 20 66 6f 6c 6c 6f |ample, t|he follo|
|000005a0| 77 69 6e 67 20 63 6f 6d | 6d 61 6e 64 20 63 6f 6d |wing com|mand com|
|000005b0| 70 61 72 65 73 20 74 68 | 65 20 54 65 58 20 66 69 |pares th|e TeX fi|
|000005c0| 6c 65 73 20 60 6f 6c 64 | 27 20 61 6e 64 0a 60 6e |les `old|' and.`n|
|000005d0| 65 77 27 2c 20 61 6e 64 | 20 6f 75 74 70 75 74 73 |ew', and| outputs|
|000005e0| 20 61 20 6d 65 72 67 65 | 64 20 66 69 6c 65 20 69 | a merge|d file i|
|000005f0| 6e 20 77 68 69 63 68 20 | 6f 6c 64 20 72 65 67 69 |n which |old regi|
|00000600| 6f 6e 73 20 61 72 65 20 | 73 75 72 72 6f 75 6e 64 |ons are |surround|
|00000610| 65 64 20 62 79 0a 60 5c | 62 65 67 69 6e 7b 65 6d |ed by.`\|begin{em|
|00000620| 7d 27 2d 60 5c 65 6e 64 | 7b 65 6d 7d 27 20 6c 69 |}'-`\end|{em}' li|
|00000630| 6e 65 73 2c 20 61 6e 64 | 20 6e 65 77 20 72 65 67 |nes, and| new reg|
|00000640| 69 6f 6e 73 20 61 72 65 | 20 73 75 72 72 6f 75 6e |ions are| surroun|
|00000650| 64 65 64 20 62 79 0a 60 | 5c 62 65 67 69 6e 7b 62 |ded by.`|\begin{b|
|00000660| 66 7d 27 2d 60 5c 65 6e | 64 7b 62 66 7d 27 20 6c |f}'-`\en|d{bf}' l|
|00000670| 69 6e 65 73 2e 0a 0a 20 | 20 20 20 20 64 69 66 66 |ines... | diff|
|00000680| 20 5c 0a 20 20 20 20 20 | 20 20 20 2d 2d 6f 6c 64 | \. | --old|
|00000690| 2d 67 72 6f 75 70 2d 66 | 6f 72 6d 61 74 3d 27 5c |-group-f|ormat='\|
|000006a0| 62 65 67 69 6e 7b 65 6d | 7d 0a 20 20 20 20 20 25 |begin{em|}. %|
|000006b0| 3c 5c 65 6e 64 7b 65 6d | 7d 0a 20 20 20 20 20 27 |<\end{em|}. '|
|000006c0| 20 5c 0a 20 20 20 20 20 | 20 20 20 2d 2d 6e 65 77 | \. | --new|
|000006d0| 2d 67 72 6f 75 70 2d 66 | 6f 72 6d 61 74 3d 27 5c |-group-f|ormat='\|
|000006e0| 62 65 67 69 6e 7b 62 66 | 7d 0a 20 20 20 20 20 25 |begin{bf|}. %|
|000006f0| 3e 5c 65 6e 64 7b 62 66 | 7d 0a 20 20 20 20 20 27 |>\end{bf|}. '|
|00000700| 20 5c 0a 20 20 20 20 20 | 20 20 20 6f 6c 64 20 6e | \. | old n|
|00000710| 65 77 0a 0a 20 20 20 54 | 68 65 20 66 6f 6c 6c 6f |ew.. T|he follo|
|00000720| 77 69 6e 67 20 63 6f 6d | 6d 61 6e 64 20 69 73 20 |wing com|mand is |
|00000730| 65 71 75 69 76 61 6c 65 | 6e 74 20 74 6f 20 74 68 |equivale|nt to th|
|00000740| 65 20 61 62 6f 76 65 20 | 65 78 61 6d 70 6c 65 2c |e above |example,|
|00000750| 20 62 75 74 20 69 74 20 | 69 73 20 61 0a 6c 69 74 | but it |is a.lit|
|00000760| 74 6c 65 20 6d 6f 72 65 | 20 76 65 72 62 6f 73 65 |tle more| verbose|
|00000770| 2c 20 62 65 63 61 75 73 | 65 20 69 74 20 73 70 65 |, becaus|e it spe|
|00000780| 6c 6c 73 20 6f 75 74 20 | 74 68 65 20 64 65 66 61 |lls out |the defa|
|00000790| 75 6c 74 20 6c 69 6e 65 | 20 67 72 6f 75 70 0a 66 |ult line| group.f|
|000007a0| 6f 72 6d 61 74 73 2e 0a | 0a 20 20 20 20 20 64 69 |ormats..|. di|
|000007b0| 66 66 20 5c 0a 20 20 20 | 20 20 20 20 20 2d 2d 6f |ff \. | --o|
|000007c0| 6c 64 2d 67 72 6f 75 70 | 2d 66 6f 72 6d 61 74 3d |ld-group|-format=|
|000007d0| 27 5c 62 65 67 69 6e 7b | 65 6d 7d 0a 20 20 20 20 |'\begin{|em}. |
|000007e0| 20 25 3c 5c 65 6e 64 7b | 65 6d 7d 0a 20 20 20 20 | %<\end{|em}. |
|000007f0| 20 27 20 5c 0a 20 20 20 | 20 20 20 20 20 2d 2d 6e | ' \. | --n|
|00000800| 65 77 2d 67 72 6f 75 70 | 2d 66 6f 72 6d 61 74 3d |ew-group|-format=|
|00000810| 27 5c 62 65 67 69 6e 7b | 62 66 7d 0a 20 20 20 20 |'\begin{|bf}. |
|00000820| 20 25 3e 5c 65 6e 64 7b | 62 66 7d 0a 20 20 20 20 | %>\end{|bf}. |
|00000830| 20 27 20 5c 0a 20 20 20 | 20 20 20 20 20 2d 2d 75 | ' \. | --u|
|00000840| 6e 63 68 61 6e 67 65 64 | 2d 67 72 6f 75 70 2d 66 |nchanged|-group-f|
|00000850| 6f 72 6d 61 74 3d 27 25 | 3d 27 20 5c 0a 20 20 20 |ormat='%|=' \. |
|00000860| 20 20 20 20 20 2d 2d 63 | 68 61 6e 67 65 64 2d 67 | --c|hanged-g|
|00000870| 72 6f 75 70 2d 66 6f 72 | 6d 61 74 3d 27 5c 62 65 |roup-for|mat='\be|
|00000880| 67 69 6e 7b 65 6d 7d 0a | 20 20 20 20 20 25 3c 5c |gin{em}.| %<\|
|00000890| 65 6e 64 7b 65 6d 7d 0a | 20 20 20 20 20 5c 62 65 |end{em}.| \be|
|000008a0| 67 69 6e 7b 62 66 7d 0a | 20 20 20 20 20 25 3e 5c |gin{bf}.| %>\|
|000008b0| 65 6e 64 7b 62 66 7d 0a | 20 20 20 20 20 27 20 5c |end{bf}.| ' \|
|000008c0| 0a 20 20 20 20 20 20 20 | 20 6f 6c 64 20 6e 65 77 |. | old new|
|000008d0| 0a 0a 20 20 20 48 65 72 | 65 20 69 73 20 61 20 6d |.. Her|e is a m|
|000008e0| 6f 72 65 20 61 64 76 61 | 6e 63 65 64 20 65 78 61 |ore adva|nced exa|
|000008f0| 6d 70 6c 65 2c 20 77 68 | 69 63 68 20 6f 75 74 70 |mple, wh|ich outp|
|00000900| 75 74 73 20 61 20 64 69 | 66 66 20 6c 69 73 74 69 |uts a di|ff listi|
|00000910| 6e 67 20 77 69 74 68 0a | 68 65 61 64 65 72 73 20 |ng with.|headers |
|00000920| 63 6f 6e 74 61 69 6e 69 | 6e 67 20 6c 69 6e 65 20 |containi|ng line |
|00000930| 6e 75 6d 62 65 72 73 20 | 69 6e 20 61 20 22 70 6c |numbers |in a "pl|
|00000940| 61 69 6e 20 45 6e 67 6c | 69 73 68 22 20 73 74 79 |ain Engl|ish" sty|
|00000950| 6c 65 2e 0a 0a 20 20 20 | 20 20 64 69 66 66 20 5c |le... | diff \|
|00000960| 0a 20 20 20 20 20 20 20 | 20 2d 2d 75 6e 63 68 61 |. | --uncha|
|00000970| 6e 67 65 64 2d 67 72 6f | 75 70 2d 66 6f 72 6d 61 |nged-gro|up-forma|
|00000980| 74 3d 27 27 20 5c 0a 20 | 20 20 20 20 20 20 20 2d |t='' \. | -|
|00000990| 2d 6f 6c 64 2d 67 72 6f | 75 70 2d 66 6f 72 6d 61 |-old-gro|up-forma|
|000009a0| 74 3d 27 2d 2d 2d 2d 2d | 2d 2d 2d 20 25 64 6e 20 |t='-----|--- %dn |
|000009b0| 6c 69 6e 65 25 28 6e 3d | 31 3f 3a 73 29 20 64 65 |line%(n=|1?:s) de|
|000009c0| 6c 65 74 65 64 20 61 74 | 20 25 64 66 3a 0a 20 20 |leted at| %df:. |
|000009d0| 20 20 20 25 3c 27 20 5c | 0a 20 20 20 20 20 20 20 | %<' \|. |
|000009e0| 20 2d 2d 6e 65 77 2d 67 | 72 6f 75 70 2d 66 6f 72 | --new-g|roup-for|
|000009f0| 6d 61 74 3d 27 2d 2d 2d | 2d 2d 2d 2d 2d 20 25 64 |mat='---|----- %d|
|00000a00| 4e 20 6c 69 6e 65 25 28 | 4e 3d 31 3f 3a 73 29 20 |N line%(|N=1?:s) |
|00000a10| 61 64 64 65 64 20 61 66 | 74 65 72 20 25 64 65 3a |added af|ter %de:|
|00000a20| 0a 20 20 20 20 20 25 3e | 27 20 5c 0a 20 20 20 20 |. %>|' \. |
|00000a30| 20 20 20 20 2d 2d 63 68 | 61 6e 67 65 64 2d 67 72 | --ch|anged-gr|
|00000a40| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 2d 2d 2d 2d |oup-form|at='----|
|00000a50| 2d 2d 2d 2d 20 25 64 6e | 20 6c 69 6e 65 25 28 6e |---- %dn| line%(n|
|00000a60| 3d 31 3f 3a 73 29 20 63 | 68 61 6e 67 65 64 20 61 |=1?:s) c|hanged a|
|00000a70| 74 20 25 64 66 3a 0a 20 | 20 20 20 20 25 3c 2d 2d |t %df:. | %<--|
|00000a80| 2d 2d 2d 2d 2d 2d 20 74 | 6f 3a 0a 20 20 20 20 20 |------ t|o:. |
|00000a90| 25 3e 27 20 5c 0a 20 20 | 20 20 20 20 20 20 6f 6c |%>' \. | ol|
|00000aa0| 64 20 6e 65 77 0a 0a 20 | 20 20 54 6f 20 73 70 65 |d new.. | To spe|
|00000ab0| 63 69 66 79 20 61 20 6c | 69 6e 65 20 67 72 6f 75 |cify a l|ine grou|
|00000ac0| 70 20 66 6f 72 6d 61 74 | 2c 20 75 73 65 20 60 64 |p format|, use `d|
|00000ad0| 69 66 66 27 20 77 69 74 | 68 20 6f 6e 65 20 6f 66 |iff' wit|h one of|
|00000ae0| 20 74 68 65 20 6f 70 74 | 69 6f 6e 73 0a 6c 69 73 | the opt|ions.lis|
|00000af0| 74 65 64 20 62 65 6c 6f | 77 2e 20 20 59 6f 75 20 |ted belo|w. You |
|00000b00| 63 61 6e 20 73 70 65 63 | 69 66 79 20 75 70 20 74 |can spec|ify up t|
|00000b10| 6f 20 66 6f 75 72 20 6c | 69 6e 65 20 67 72 6f 75 |o four l|ine grou|
|00000b20| 70 20 66 6f 72 6d 61 74 | 73 2c 20 6f 6e 65 20 66 |p format|s, one f|
|00000b30| 6f 72 0a 65 61 63 68 20 | 6b 69 6e 64 20 6f 66 20 |or.each |kind of |
|00000b40| 6c 69 6e 65 20 67 72 6f | 75 70 2e 20 20 59 6f 75 |line gro|up. You|
|00000b50| 20 73 68 6f 75 6c 64 20 | 71 75 6f 74 65 20 46 4f | should |quote FO|
|00000b60| 52 4d 41 54 2c 20 62 65 | 63 61 75 73 65 20 69 74 |RMAT, be|cause it|
|00000b70| 20 74 79 70 69 63 61 6c | 6c 79 0a 63 6f 6e 74 61 | typical|ly.conta|
|00000b80| 69 6e 73 20 73 68 65 6c | 6c 20 6d 65 74 61 63 68 |ins shel|l metach|
|00000b90| 61 72 61 63 74 65 72 73 | 2e 0a 0a 60 2d 2d 6f 6c |aracters|...`--ol|
|00000ba0| 64 2d 67 72 6f 75 70 2d | 66 6f 72 6d 61 74 3d 46 |d-group-|format=F|
|00000bb0| 4f 52 4d 41 54 27 0a 20 | 20 20 20 20 54 68 65 73 |ORMAT'. | Thes|
|00000bc0| 65 20 6c 69 6e 65 20 67 | 72 6f 75 70 73 20 61 72 |e line g|roups ar|
|00000bd0| 65 20 68 75 6e 6b 73 20 | 63 6f 6e 74 61 69 6e 69 |e hunks |containi|
|00000be0| 6e 67 20 6f 6e 6c 79 20 | 6c 69 6e 65 73 20 66 72 |ng only |lines fr|
|00000bf0| 6f 6d 20 74 68 65 20 66 | 69 72 73 74 0a 20 20 20 |om the f|irst. |
|00000c00| 20 20 66 69 6c 65 2e 20 | 20 54 68 65 20 64 65 66 | file. | The def|
|00000c10| 61 75 6c 74 20 6f 6c 64 | 20 67 72 6f 75 70 20 66 |ault old| group f|
|00000c20| 6f 72 6d 61 74 20 69 73 | 20 74 68 65 20 73 61 6d |ormat is| the sam|
|00000c30| 65 20 61 73 20 74 68 65 | 20 63 68 61 6e 67 65 64 |e as the| changed|
|00000c40| 0a 20 20 20 20 20 67 72 | 6f 75 70 20 66 6f 72 6d |. gr|oup form|
|00000c50| 61 74 20 69 66 20 69 74 | 20 69 73 20 73 70 65 63 |at if it| is spec|
|00000c60| 69 66 69 65 64 3b 20 6f | 74 68 65 72 77 69 73 65 |ified; o|therwise|
|00000c70| 20 69 74 20 69 73 20 61 | 20 66 6f 72 6d 61 74 20 | it is a| format |
|00000c80| 74 68 61 74 0a 20 20 20 | 20 20 6f 75 74 70 75 74 |that. | output|
|00000c90| 73 20 74 68 65 20 6c 69 | 6e 65 20 67 72 6f 75 70 |s the li|ne group|
|00000ca0| 20 61 73 2d 69 73 2e 0a | 0a 60 2d 2d 6e 65 77 2d | as-is..|.`--new-|
|00000cb0| 67 72 6f 75 70 2d 66 6f | 72 6d 61 74 3d 46 4f 52 |group-fo|rmat=FOR|
|00000cc0| 4d 41 54 27 0a 20 20 20 | 20 20 54 68 65 73 65 20 |MAT'. | These |
|00000cd0| 6c 69 6e 65 20 67 72 6f | 75 70 73 20 61 72 65 20 |line gro|ups are |
|00000ce0| 68 75 6e 6b 73 20 63 6f | 6e 74 61 69 6e 69 6e 67 |hunks co|ntaining|
|00000cf0| 20 6f 6e 6c 79 20 6c 69 | 6e 65 73 20 66 72 6f 6d | only li|nes from|
|00000d00| 20 74 68 65 20 73 65 63 | 6f 6e 64 0a 20 20 20 20 | the sec|ond. |
|00000d10| 20 66 69 6c 65 2e 20 20 | 54 68 65 20 64 65 66 61 | file. |The defa|
|00000d20| 75 6c 74 20 6e 65 77 20 | 67 72 6f 75 70 20 66 6f |ult new |group fo|
|00000d30| 72 6d 61 74 20 69 73 20 | 73 61 6d 65 20 61 73 20 |rmat is |same as |
|00000d40| 74 68 65 20 74 68 65 20 | 63 68 61 6e 67 65 64 0a |the the |changed.|
|00000d50| 20 20 20 20 20 67 72 6f | 75 70 20 66 6f 72 6d 61 | gro|up forma|
|00000d60| 74 20 69 66 20 69 74 20 | 69 73 20 73 70 65 63 69 |t if it |is speci|
|00000d70| 66 69 65 64 3b 20 6f 74 | 68 65 72 77 69 73 65 20 |fied; ot|herwise |
|00000d80| 69 74 20 69 73 20 61 20 | 66 6f 72 6d 61 74 20 74 |it is a |format t|
|00000d90| 68 61 74 0a 20 20 20 20 | 20 6f 75 74 70 75 74 73 |hat. | outputs|
|00000da0| 20 74 68 65 20 6c 69 6e | 65 20 67 72 6f 75 70 20 | the lin|e group |
|00000db0| 61 73 2d 69 73 2e 0a 0a | 60 2d 2d 63 68 61 6e 67 |as-is...|`--chang|
|00000dc0| 65 64 2d 67 72 6f 75 70 | 2d 66 6f 72 6d 61 74 3d |ed-group|-format=|
|00000dd0| 46 4f 52 4d 41 54 27 0a | 20 20 20 20 20 54 68 65 |FORMAT'.| The|
|00000de0| 73 65 20 6c 69 6e 65 20 | 67 72 6f 75 70 73 20 61 |se line |groups a|
|00000df0| 72 65 20 68 75 6e 6b 73 | 20 63 6f 6e 74 61 69 6e |re hunks| contain|
|00000e00| 69 6e 67 20 6c 69 6e 65 | 73 20 66 72 6f 6d 20 62 |ing line|s from b|
|00000e10| 6f 74 68 20 66 69 6c 65 | 73 2e 20 20 54 68 65 0a |oth file|s. The.|
|00000e20| 20 20 20 20 20 64 65 66 | 61 75 6c 74 20 63 68 61 | def|ault cha|
|00000e30| 6e 67 65 64 20 67 72 6f | 75 70 20 66 6f 72 6d 61 |nged gro|up forma|
|00000e40| 74 20 69 73 20 74 68 65 | 20 63 6f 6e 63 61 74 65 |t is the| concate|
|00000e50| 6e 61 74 69 6f 6e 20 6f | 66 20 74 68 65 20 6f 6c |nation o|f the ol|
|00000e60| 64 20 61 6e 64 0a 20 20 | 20 20 20 6e 65 77 20 67 |d and. | new g|
|00000e70| 72 6f 75 70 20 66 6f 72 | 6d 61 74 73 2e 0a 0a 60 |roup for|mats...`|
|00000e80| 2d 2d 75 6e 63 68 61 6e | 67 65 64 2d 67 72 6f 75 |--unchan|ged-grou|
|00000e90| 70 2d 66 6f 72 6d 61 74 | 3d 46 4f 52 4d 41 54 27 |p-format|=FORMAT'|
|00000ea0| 0a 20 20 20 20 20 54 68 | 65 73 65 20 6c 69 6e 65 |. Th|ese line|
|00000eb0| 20 67 72 6f 75 70 73 20 | 63 6f 6e 74 61 69 6e 20 | groups |contain |
|00000ec0| 6c 69 6e 65 73 20 63 6f | 6d 6d 6f 6e 20 74 6f 20 |lines co|mmon to |
|00000ed0| 62 6f 74 68 20 66 69 6c | 65 73 2e 20 20 54 68 65 |both fil|es. The|
|00000ee0| 20 64 65 66 61 75 6c 74 | 0a 20 20 20 20 20 75 6e | default|. un|
|00000ef0| 63 68 61 6e 67 65 64 20 | 67 72 6f 75 70 20 66 6f |changed |group fo|
|00000f00| 72 6d 61 74 20 69 73 20 | 61 20 66 6f 72 6d 61 74 |rmat is |a format|
|00000f10| 20 74 68 61 74 20 6f 75 | 74 70 75 74 73 20 74 68 | that ou|tputs th|
|00000f20| 65 20 6c 69 6e 65 20 67 | 72 6f 75 70 0a 20 20 20 |e line g|roup. |
|00000f30| 20 20 61 73 2d 69 73 2e | 0a 0a 20 20 20 49 6e 20 | as-is.|.. In |
|00000f40| 61 20 6c 69 6e 65 20 67 | 72 6f 75 70 20 66 6f 72 |a line g|roup for|
|00000f50| 6d 61 74 2c 20 6f 72 64 | 69 6e 61 72 79 20 63 68 |mat, ord|inary ch|
|00000f60| 61 72 61 63 74 65 72 73 | 20 72 65 70 72 65 73 65 |aracters| represe|
|00000f70| 6e 74 20 74 68 65 6d 73 | 65 6c 76 65 73 3b 0a 63 |nt thems|elves;.c|
|00000f80| 6f 6e 76 65 72 73 69 6f | 6e 20 73 70 65 63 69 66 |onversio|n specif|
|00000f90| 69 63 61 74 69 6f 6e 73 | 20 73 74 61 72 74 20 77 |ications| start w|
|00000fa0| 69 74 68 20 60 25 27 20 | 61 6e 64 20 68 61 76 65 |ith `%' |and have|
|00000fb0| 20 6f 6e 65 20 6f 66 20 | 74 68 65 20 66 6f 6c 6c | one of |the foll|
|00000fc0| 6f 77 69 6e 67 0a 66 6f | 72 6d 73 2e 0a 0a 60 25 |owing.fo|rms...`%|
|00000fd0| 3c 27 0a 20 20 20 20 20 | 73 74 61 6e 64 73 20 66 |<'. |stands f|
|00000fe0| 6f 72 20 74 68 65 20 6c | 69 6e 65 73 20 66 72 6f |or the l|ines fro|
|00000ff0| 6d 20 74 68 65 20 66 69 | 72 73 74 20 66 69 6c 65 |m the fi|rst file|
|00001000| 2c 20 69 6e 63 6c 75 64 | 69 6e 67 20 74 68 65 20 |, includ|ing the |
|00001010| 74 72 61 69 6c 69 6e 67 | 0a 20 20 20 20 20 6e 65 |trailing|. ne|
|00001020| 77 6c 69 6e 65 2e 20 20 | 45 61 63 68 20 6c 69 6e |wline. |Each lin|
|00001030| 65 20 69 73 20 66 6f 72 | 6d 61 74 74 65 64 20 61 |e is for|matted a|
|00001040| 63 63 6f 72 64 69 6e 67 | 20 74 6f 20 74 68 65 20 |ccording| to the |
|00001050| 6f 6c 64 20 6c 69 6e 65 | 20 66 6f 72 6d 61 74 0a |old line| format.|
|00001060| 20 20 20 20 20 28 2a 6e | 6f 74 65 20 4c 69 6e 65 | (*n|ote Line|
|00001070| 20 46 6f 72 6d 61 74 73 | 3a 3a 2e 29 2e 0a 0a 60 | Formats|::.)...`|
|00001080| 25 3e 27 0a 20 20 20 20 | 20 73 74 61 6e 64 73 20 |%>'. | stands |
|00001090| 66 6f 72 20 74 68 65 20 | 6c 69 6e 65 73 20 66 72 |for the |lines fr|
|000010a0| 6f 6d 20 74 68 65 20 73 | 65 63 6f 6e 64 20 66 69 |om the s|econd fi|
|000010b0| 6c 65 2c 20 69 6e 63 6c | 75 64 69 6e 67 20 74 68 |le, incl|uding th|
|000010c0| 65 20 74 72 61 69 6c 69 | 6e 67 0a 20 20 20 20 20 |e traili|ng. |
|000010d0| 6e 65 77 6c 69 6e 65 2e | 20 20 45 61 63 68 20 6c |newline.| Each l|
|000010e0| 69 6e 65 20 69 73 20 66 | 6f 72 6d 61 74 74 65 64 |ine is f|ormatted|
|000010f0| 20 61 63 63 6f 72 64 69 | 6e 67 20 74 6f 20 74 68 | accordi|ng to th|
|00001100| 65 20 6e 65 77 20 6c 69 | 6e 65 20 66 6f 72 6d 61 |e new li|ne forma|
|00001110| 74 2e 0a 0a 60 25 3d 27 | 0a 20 20 20 20 20 73 74 |t...`%='|. st|
|00001120| 61 6e 64 73 20 66 6f 72 | 20 74 68 65 20 6c 69 6e |ands for| the lin|
|00001130| 65 73 20 63 6f 6d 6d 6f | 6e 20 74 6f 20 62 6f 74 |es commo|n to bot|
|00001140| 68 20 66 69 6c 65 73 2c | 20 69 6e 63 6c 75 64 69 |h files,| includi|
|00001150| 6e 67 20 74 68 65 20 74 | 72 61 69 6c 69 6e 67 0a |ng the t|railing.|
|00001160| 20 20 20 20 20 6e 65 77 | 6c 69 6e 65 2e 20 20 45 | new|line. E|
|00001170| 61 63 68 20 6c 69 6e 65 | 20 69 73 20 66 6f 72 6d |ach line| is form|
|00001180| 61 74 74 65 64 20 61 63 | 63 6f 72 64 69 6e 67 20 |atted ac|cording |
|00001190| 74 6f 20 74 68 65 20 75 | 6e 63 68 61 6e 67 65 64 |to the u|nchanged|
|000011a0| 20 6c 69 6e 65 0a 20 20 | 20 20 20 66 6f 72 6d 61 | line. | forma|
|000011b0| 74 2e 0a 0a 60 25 25 27 | 0a 20 20 20 20 20 73 74 |t...`%%'|. st|
|000011c0| 61 6e 64 73 20 66 6f 72 | 20 60 25 27 2e 0a 0a 60 |ands for| `%'...`|
|000011d0| 25 63 27 43 27 27 0a 20 | 20 20 20 20 77 68 65 72 |%c'C''. | wher|
|000011e0| 65 20 43 20 69 73 20 61 | 20 73 69 6e 67 6c 65 20 |e C is a| single |
|000011f0| 63 68 61 72 61 63 74 65 | 72 2c 20 73 74 61 6e 64 |characte|r, stand|
|00001200| 73 20 66 6f 72 20 43 2e | 20 20 43 20 6d 61 79 20 |s for C.| C may |
|00001210| 6e 6f 74 20 62 65 20 61 | 0a 20 20 20 20 20 62 61 |not be a|. ba|
|00001220| 63 6b 73 6c 61 73 68 20 | 6f 72 20 61 6e 20 61 70 |ckslash |or an ap|
|00001230| 6f 73 74 72 6f 70 68 65 | 2e 20 20 46 6f 72 20 65 |ostrophe|. For e|
|00001240| 78 61 6d 70 6c 65 2c 20 | 60 25 63 27 3a 27 27 20 |xample, |`%c':'' |
|00001250| 73 74 61 6e 64 73 20 66 | 6f 72 20 61 0a 20 20 20 |stands f|or a. |
|00001260| 20 20 63 6f 6c 6f 6e 2c | 20 65 76 65 6e 20 69 6e | colon,| even in|
|00001270| 73 69 64 65 20 74 68 65 | 20 74 68 65 6e 2d 70 61 |side the| then-pa|
|00001280| 72 74 20 6f 66 20 61 6e | 20 69 66 2d 74 68 65 6e |rt of an| if-then|
|00001290| 2d 65 6c 73 65 20 66 6f | 72 6d 61 74 2c 20 77 68 |-else fo|rmat, wh|
|000012a0| 69 63 68 0a 20 20 20 20 | 20 61 20 63 6f 6c 6f 6e |ich. | a colon|
|000012b0| 20 77 6f 75 6c 64 20 6e | 6f 72 6d 61 6c 6c 79 20 | would n|ormally |
|000012c0| 74 65 72 6d 69 6e 61 74 | 65 2e 0a 0a 60 25 63 27 |terminat|e...`%c'|
|000012d0| 5c 4f 27 27 0a 20 20 20 | 20 20 77 68 65 72 65 20 |\O''. | where |
|000012e0| 4f 20 69 73 20 61 20 73 | 74 72 69 6e 67 20 6f 66 |O is a s|tring of|
|000012f0| 20 31 2c 20 32 2c 20 6f | 72 20 33 20 6f 63 74 61 | 1, 2, o|r 3 octa|
|00001300| 6c 20 64 69 67 69 74 73 | 2c 20 73 74 61 6e 64 73 |l digits|, stands|
|00001310| 20 66 6f 72 20 74 68 65 | 0a 20 20 20 20 20 63 68 | for the|. ch|
|00001320| 61 72 61 63 74 65 72 20 | 77 69 74 68 20 6f 63 74 |aracter |with oct|
|00001330| 61 6c 20 63 6f 64 65 20 | 4f 2e 20 20 46 6f 72 20 |al code |O. For |
|00001340| 65 78 61 6d 70 6c 65 2c | 20 60 25 63 27 5c 30 27 |example,| `%c'\0'|
|00001350| 27 20 73 74 61 6e 64 73 | 20 66 6f 72 20 61 0a 20 |' stands| for a. |
|00001360| 20 20 20 20 6e 75 6c 6c | 20 63 68 61 72 61 63 74 | null| charact|
|00001370| 65 72 2e 0a 0a 60 46 4e | 27 0a 20 20 20 20 20 77 |er...`FN|'. w|
|00001380| 68 65 72 65 20 46 20 69 | 73 20 61 20 60 70 72 69 |here F i|s a `pri|
|00001390| 6e 74 66 27 20 63 6f 6e | 76 65 72 73 69 6f 6e 20 |ntf' con|version |
|000013a0| 73 70 65 63 69 66 69 63 | 61 74 69 6f 6e 20 61 6e |specific|ation an|
|000013b0| 64 20 4e 20 69 73 20 6f | 6e 65 20 6f 66 20 74 68 |d N is o|ne of th|
|000013c0| 65 0a 20 20 20 20 20 66 | 6f 6c 6c 6f 77 69 6e 67 |e. f|ollowing|
|000013d0| 20 6c 65 74 74 65 72 73 | 2c 20 73 74 61 6e 64 73 | letters|, stands|
|000013e0| 20 66 6f 72 20 4e 27 73 | 20 76 61 6c 75 65 20 66 | for N's| value f|
|000013f0| 6f 72 6d 61 74 74 65 64 | 20 77 69 74 68 20 46 2e |ormatted| with F.|
|00001400| 0a 0a 20 20 20 20 60 65 | 27 0a 20 20 20 20 20 20 |.. `e|'. |
|00001410| 20 20 20 20 54 68 65 20 | 6c 69 6e 65 20 6e 75 6d | The |line num|
|00001420| 62 65 72 20 6f 66 20 74 | 68 65 20 6c 69 6e 65 20 |ber of t|he line |
|00001430| 6a 75 73 74 20 62 65 66 | 6f 72 65 20 74 68 65 20 |just bef|ore the |
|00001440| 67 72 6f 75 70 20 69 6e | 20 74 68 65 20 6f 6c 64 |group in| the old|
|00001450| 0a 20 20 20 20 20 20 20 | 20 20 20 66 69 6c 65 2e |. | file.|
|00001460| 0a 0a 20 20 20 20 60 66 | 27 0a 20 20 20 20 20 20 |.. `f|'. |
|00001470| 20 20 20 20 54 68 65 20 | 6c 69 6e 65 20 6e 75 6d | The |line num|
|00001480| 62 65 72 20 6f 66 20 74 | 68 65 20 66 69 72 73 74 |ber of t|he first|
|00001490| 20 6c 69 6e 65 20 69 6e | 20 74 68 65 20 67 72 6f | line in| the gro|
|000014a0| 75 70 20 69 6e 20 74 68 | 65 20 6f 6c 64 0a 20 20 |up in th|e old. |
|000014b0| 20 20 20 20 20 20 20 20 | 66 69 6c 65 3b 20 65 71 | |file; eq|
|000014c0| 75 61 6c 73 20 45 20 2b | 20 31 2e 0a 0a 20 20 20 |uals E +| 1... |
|000014d0| 20 60 6c 27 0a 20 20 20 | 20 20 20 20 20 20 20 54 | `l'. | T|
|000014e0| 68 65 20 6c 69 6e 65 20 | 6e 75 6d 62 65 72 20 6f |he line |number o|
|000014f0| 66 20 74 68 65 20 6c 61 | 73 74 20 6c 69 6e 65 20 |f the la|st line |
|00001500| 69 6e 20 74 68 65 20 67 | 72 6f 75 70 20 69 6e 20 |in the g|roup in |
|00001510| 74 68 65 20 6f 6c 64 20 | 66 69 6c 65 2e 0a 0a 20 |the old |file... |
|00001520| 20 20 20 60 6d 27 0a 20 | 20 20 20 20 20 20 20 20 | `m'. | |
|00001530| 20 54 68 65 20 6c 69 6e | 65 20 6e 75 6d 62 65 72 | The lin|e number|
|00001540| 20 6f 66 20 74 68 65 20 | 6c 69 6e 65 20 6a 75 73 | of the |line jus|
|00001550| 74 20 61 66 74 65 72 20 | 74 68 65 20 67 72 6f 75 |t after |the grou|
|00001560| 70 20 69 6e 20 74 68 65 | 20 6f 6c 64 0a 20 20 20 |p in the| old. |
|00001570| 20 20 20 20 20 20 20 66 | 69 6c 65 3b 20 65 71 75 | f|ile; equ|
|00001580| 61 6c 73 20 4c 20 2b 20 | 31 2e 0a 0a 20 20 20 20 |als L + |1... |
|00001590| 60 6e 27 0a 20 20 20 20 | 20 20 20 20 20 20 54 68 |`n'. | Th|
|000015a0| 65 20 6e 75 6d 62 65 72 | 20 6f 66 20 6c 69 6e 65 |e number| of line|
|000015b0| 73 20 69 6e 20 74 68 65 | 20 67 72 6f 75 70 20 69 |s in the| group i|
|000015c0| 6e 20 74 68 65 20 6f 6c | 64 20 66 69 6c 65 3b 20 |n the ol|d file; |
|000015d0| 65 71 75 61 6c 73 20 4c | 20 2d 0a 20 20 20 20 20 |equals L| -. |
|000015e0| 20 20 20 20 20 46 20 2b | 20 31 2e 0a 0a 20 20 20 | F +| 1... |
|000015f0| 20 60 45 2c 20 46 2c 20 | 4c 2c 20 4d 2c 20 4e 27 | `E, F, |L, M, N'|
|00001600| 0a 20 20 20 20 20 20 20 | 20 20 20 4c 69 6b 65 77 |. | Likew|
|00001610| 69 73 65 2c 20 66 6f 72 | 20 6c 69 6e 65 73 20 69 |ise, for| lines i|
|00001620| 6e 20 74 68 65 20 6e 65 | 77 20 66 69 6c 65 2e 0a |n the ne|w file..|
|00001630| 0a 20 20 20 20 20 54 68 | 65 20 60 70 72 69 6e 74 |. Th|e `print|
|00001640| 66 27 20 63 6f 6e 76 65 | 72 73 69 6f 6e 20 73 70 |f' conve|rsion sp|
|00001650| 65 63 69 66 69 63 61 74 | 69 6f 6e 20 63 61 6e 20 |ecificat|ion can |
|00001660| 62 65 20 60 25 64 27 2c | 20 60 25 6f 27 2c 20 60 |be `%d',| `%o', `|
|00001670| 25 78 27 2c 20 6f 72 0a | 20 20 20 20 20 60 25 58 |%x', or.| `%X|
|00001680| 27 2c 20 73 70 65 63 69 | 66 79 69 6e 67 20 64 65 |', speci|fying de|
|00001690| 63 69 6d 61 6c 2c 20 6f | 63 74 61 6c 2c 20 6c 6f |cimal, o|ctal, lo|
|000016a0| 77 65 72 20 63 61 73 65 | 20 68 65 78 61 64 65 63 |wer case| hexadec|
|000016b0| 69 6d 61 6c 2c 20 6f 72 | 20 75 70 70 65 72 0a 20 |imal, or| upper. |
|000016c0| 20 20 20 20 63 61 73 65 | 20 68 65 78 61 64 65 63 | case| hexadec|
|000016d0| 69 6d 61 6c 20 6f 75 74 | 70 75 74 20 72 65 73 70 |imal out|put resp|
|000016e0| 65 63 74 69 76 65 6c 79 | 2e 20 20 41 66 74 65 72 |ectively|. After|
|000016f0| 20 74 68 65 20 60 25 27 | 20 74 68 65 20 66 6f 6c | the `%'| the fol|
|00001700| 6c 6f 77 69 6e 67 0a 20 | 20 20 20 20 6f 70 74 69 |lowing. | opti|
|00001710| 6f 6e 73 20 63 61 6e 20 | 61 70 70 65 61 72 20 69 |ons can |appear i|
|00001720| 6e 20 73 65 71 75 65 6e | 63 65 3a 20 61 20 60 2d |n sequen|ce: a `-|
|00001730| 27 20 73 70 65 63 69 66 | 79 69 6e 67 0a 20 20 20 |' specif|ying. |
|00001740| 20 20 6c 65 66 74 2d 6a | 75 73 74 69 66 69 63 61 | left-j|ustifica|
|00001750| 74 69 6f 6e 3b 20 61 6e | 20 69 6e 74 65 67 65 72 |tion; an| integer|
|00001760| 20 73 70 65 63 69 66 79 | 69 6e 67 20 74 68 65 20 | specify|ing the |
|00001770| 6d 69 6e 69 6d 75 6d 20 | 66 69 65 6c 64 20 77 69 |minimum |field wi|
|00001780| 64 74 68 3b 0a 20 20 20 | 20 20 61 6e 64 20 61 20 |dth;. | and a |
|00001790| 70 65 72 69 6f 64 20 66 | 6f 6c 6c 6f 77 65 64 20 |period f|ollowed |
|000017a0| 62 79 20 61 6e 20 6f 70 | 74 69 6f 6e 61 6c 20 69 |by an op|tional i|
|000017b0| 6e 74 65 67 65 72 20 73 | 70 65 63 69 66 79 69 6e |nteger s|pecifyin|
|000017c0| 67 20 74 68 65 0a 20 20 | 20 20 20 6d 69 6e 69 6d |g the. | minim|
|000017d0| 75 6d 20 6e 75 6d 62 65 | 72 20 6f 66 20 64 69 67 |um numbe|r of dig|
|000017e0| 69 74 73 2e 20 20 46 6f | 72 20 65 78 61 6d 70 6c |its. Fo|r exampl|
|000017f0| 65 2c 20 60 25 35 64 4e | 27 20 70 72 69 6e 74 73 |e, `%5dN|' prints|
|00001800| 20 74 68 65 20 6e 75 6d | 62 65 72 0a 20 20 20 20 | the num|ber. |
|00001810| 20 6f 66 20 6e 65 77 20 | 6c 69 6e 65 73 20 69 6e | of new |lines in|
|00001820| 20 74 68 65 20 67 72 6f | 75 70 20 69 6e 20 61 20 | the gro|up in a |
|00001830| 66 69 65 6c 64 20 6f 66 | 20 77 69 64 74 68 20 35 |field of| width 5|
|00001840| 20 63 68 61 72 61 63 74 | 65 72 73 2c 20 75 73 69 | charact|ers, usi|
|00001850| 6e 67 0a 20 20 20 20 20 | 74 68 65 20 60 70 72 69 |ng. |the `pri|
|00001860| 6e 74 66 27 20 66 6f 72 | 6d 61 74 20 60 22 25 35 |ntf' for|mat `"%5|
|00001870| 64 22 27 2e 0a 0a 60 28 | 41 3d 42 3f 54 3a 45 29 |d"'...`(|A=B?T:E)|
|00001880| 27 0a 20 20 20 20 20 49 | 66 20 41 20 65 71 75 61 |'. I|f A equa|
|00001890| 6c 73 20 42 20 74 68 65 | 6e 20 54 20 65 6c 73 65 |ls B the|n T else|
|000018a0| 20 45 2e 20 20 41 20 61 | 6e 64 20 42 20 61 72 65 | E. A a|nd B are|
|000018b0| 20 65 61 63 68 20 65 69 | 74 68 65 72 20 61 20 64 | each ei|ther a d|
|000018c0| 65 63 69 6d 61 6c 0a 20 | 20 20 20 20 63 6f 6e 73 |ecimal. | cons|
|000018d0| 74 61 6e 74 20 6f 72 20 | 61 20 73 69 6e 67 6c 65 |tant or |a single|
|000018e0| 20 6c 65 74 74 65 72 20 | 69 6e 74 65 72 70 72 65 | letter |interpre|
|000018f0| 74 65 64 20 61 73 20 61 | 62 6f 76 65 2e 20 20 54 |ted as a|bove. T|
|00001900| 68 69 73 20 66 6f 72 6d | 61 74 0a 20 20 20 20 20 |his form|at. |
|00001910| 73 70 65 63 20 69 73 20 | 65 71 75 69 76 61 6c 65 |spec is |equivale|
|00001920| 6e 74 20 74 6f 20 54 20 | 69 66 20 41 27 73 20 76 |nt to T |if A's v|
|00001930| 61 6c 75 65 20 65 71 75 | 61 6c 73 20 42 27 73 3b |alue equ|als B's;|
|00001940| 20 6f 74 68 65 72 77 69 | 73 65 20 69 74 20 69 73 | otherwi|se it is|
|00001950| 0a 20 20 20 20 20 65 71 | 75 69 76 61 6c 65 6e 74 |. eq|uivalent|
|00001960| 20 74 6f 20 45 2e 0a 0a | 20 20 20 20 20 46 6f 72 | to E...| For|
|00001970| 20 65 78 61 6d 70 6c 65 | 2c 20 60 25 28 4e 3d 30 | example|, `%(N=0|
|00001980| 3f 6e 6f 3a 25 64 4e 29 | 20 6c 69 6e 65 25 28 4e |?no:%dN)| line%(N|
|00001990| 3d 31 3f 3a 73 29 27 20 | 69 73 20 65 71 75 69 76 |=1?:s)' |is equiv|
|000019a0| 61 6c 65 6e 74 20 74 6f | 20 60 6e 6f 0a 20 20 20 |alent to| `no. |
|000019b0| 20 20 6c 69 6e 65 73 27 | 20 69 66 20 4e 20 28 74 | lines'| if N (t|
|000019c0| 68 65 20 6e 75 6d 62 65 | 72 20 6f 66 20 6c 69 6e |he numbe|r of lin|
|000019d0| 65 73 20 69 6e 20 74 68 | 65 20 67 72 6f 75 70 20 |es in th|e group |
|000019e0| 69 6e 20 74 68 65 20 74 | 68 65 20 6e 65 77 20 66 |in the t|he new f|
|000019f0| 69 6c 65 29 0a 20 20 20 | 20 20 69 73 20 30 2c 20 |ile). | is 0, |
|00001a00| 74 6f 20 60 31 20 6c 69 | 6e 65 27 20 69 66 20 4e |to `1 li|ne' if N|
|00001a10| 20 69 73 20 31 2c 20 61 | 6e 64 20 74 6f 20 60 25 | is 1, a|nd to `%|
|00001a20| 64 4e 20 6c 69 6e 65 73 | 27 20 6f 74 68 65 72 77 |dN lines|' otherw|
|00001a30| 69 73 65 2e 0a 0a 1f 0a | 46 69 6c 65 3a 20 64 69 |ise.....|File: di|
|00001a40| 66 66 2e 69 6e 66 6f 2c | 20 20 4e 6f 64 65 3a 20 |ff.info,| Node: |
|00001a50| 4c 69 6e 65 20 46 6f 72 | 6d 61 74 73 2c 20 20 4e |Line For|mats, N|
|00001a60| 65 78 74 3a 20 44 65 74 | 61 69 6c 65 64 20 49 66 |ext: Det|ailed If|
|00001a70| 2d 74 68 65 6e 2d 65 6c | 73 65 2c 20 20 50 72 65 |-then-el|se, Pre|
|00001a80| 76 3a 20 4c 69 6e 65 20 | 47 72 6f 75 70 20 46 6f |v: Line |Group Fo|
|00001a90| 72 6d 61 74 73 2c 20 20 | 55 70 3a 20 49 66 2d 74 |rmats, |Up: If-t|
|00001aa0| 68 65 6e 2d 65 6c 73 65 | 0a 0a 4c 69 6e 65 20 46 |hen-else|..Line F|
|00001ab0| 6f 72 6d 61 74 73 0a 2d | 2d 2d 2d 2d 2d 2d 2d 2d |ormats.-|--------|
|00001ac0| 2d 2d 2d 0a 0a 20 20 20 | 4c 69 6e 65 20 66 6f 72 |---.. |Line for|
|00001ad0| 6d 61 74 73 20 63 6f 6e | 74 72 6f 6c 20 68 6f 77 |mats con|trol how|
|00001ae0| 20 65 61 63 68 20 6c 69 | 6e 65 20 74 61 6b 65 6e | each li|ne taken|
|00001af0| 20 66 72 6f 6d 20 61 6e | 20 69 6e 70 75 74 20 66 | from an| input f|
|00001b00| 69 6c 65 20 69 73 0a 6f | 75 74 70 75 74 20 61 73 |ile is.o|utput as|
|00001b10| 20 70 61 72 74 20 6f 66 | 20 61 20 6c 69 6e 65 20 | part of| a line |
|00001b20| 67 72 6f 75 70 20 69 6e | 20 69 66 2d 74 68 65 6e |group in| if-then|
|00001b30| 2d 65 6c 73 65 20 66 6f | 72 6d 61 74 2e 0a 0a 20 |-else fo|rmat... |
|00001b40| 20 20 46 6f 72 20 65 78 | 61 6d 70 6c 65 2c 20 74 | For ex|ample, t|
|00001b50| 68 65 20 66 6f 6c 6c 6f | 77 69 6e 67 20 63 6f 6d |he follo|wing com|
|00001b60| 6d 61 6e 64 20 6f 75 74 | 70 75 74 73 20 74 65 78 |mand out|puts tex|
|00001b70| 74 20 77 69 74 68 20 61 | 20 6f 6e 65 2d 63 6f 6c |t with a| one-col|
|00001b80| 75 6d 6e 0a 63 68 61 6e | 67 65 20 69 6e 64 69 63 |umn.chan|ge indic|
|00001b90| 61 74 6f 72 20 74 6f 20 | 74 68 65 20 6c 65 66 74 |ator to |the left|
|00001ba0| 20 6f 66 20 74 68 65 20 | 74 65 78 74 2e 20 20 54 | of the |text. T|
|00001bb0| 68 65 20 66 69 72 73 74 | 20 63 6f 6c 75 6d 6e 20 |he first| column |
|00001bc0| 6f 66 20 6f 75 74 70 75 | 74 0a 69 73 20 60 2d 27 |of outpu|t.is `-'|
|00001bd0| 20 66 6f 72 20 64 65 6c | 65 74 65 64 20 6c 69 6e | for del|eted lin|
|00001be0| 65 73 2c 20 60 7c 27 20 | 66 6f 72 20 61 64 64 65 |es, `|' |for adde|
|00001bf0| 64 20 6c 69 6e 65 73 2c | 20 61 6e 64 20 61 20 73 |d lines,| and a s|
|00001c00| 70 61 63 65 20 66 6f 72 | 0a 75 6e 63 68 61 6e 67 |pace for|.unchang|
|00001c10| 65 64 20 6c 69 6e 65 73 | 2e 20 20 54 68 65 20 66 |ed lines|. The f|
|00001c20| 6f 72 6d 61 74 73 20 63 | 6f 6e 74 61 69 6e 20 6e |ormats c|ontain n|
|00001c30| 65 77 6c 69 6e 65 20 63 | 68 61 72 61 63 74 65 72 |ewline c|haracter|
|00001c40| 73 20 77 68 65 72 65 20 | 6e 65 77 6c 69 6e 65 73 |s where |newlines|
|00001c50| 0a 61 72 65 20 64 65 73 | 69 72 65 64 20 6f 6e 20 |.are des|ired on |
|00001c60| 6f 75 74 70 75 74 2e 0a | 0a 20 20 20 20 20 64 69 |output..|. di|
|00001c70| 66 66 20 5c 0a 20 20 20 | 20 20 20 20 20 2d 2d 6f |ff \. | --o|
|00001c80| 6c 64 2d 6c 69 6e 65 2d | 66 6f 72 6d 61 74 3d 27 |ld-line-|format='|
|00001c90| 2d 25 6c 0a 20 20 20 20 | 20 27 20 5c 0a 20 20 20 |-%l. | ' \. |
|00001ca0| 20 20 20 20 20 2d 2d 6e | 65 77 2d 6c 69 6e 65 2d | --n|ew-line-|
|00001cb0| 66 6f 72 6d 61 74 3d 27 | 7c 25 6c 0a 20 20 20 20 |format='||%l. |
|00001cc0| 20 27 20 5c 0a 20 20 20 | 20 20 20 20 20 2d 2d 75 | ' \. | --u|
|00001cd0| 6e 63 68 61 6e 67 65 64 | 2d 6c 69 6e 65 2d 66 6f |nchanged|-line-fo|
|00001ce0| 72 6d 61 74 3d 27 20 25 | 6c 0a 20 20 20 20 20 27 |rmat=' %|l. '|
|00001cf0| 20 5c 0a 20 20 20 20 20 | 20 20 20 6f 6c 64 20 6e | \. | old n|
|00001d00| 65 77 0a 0a 20 20 20 54 | 6f 20 73 70 65 63 69 66 |ew.. T|o specif|
|00001d10| 79 20 61 20 6c 69 6e 65 | 20 66 6f 72 6d 61 74 2c |y a line| format,|
|00001d20| 20 75 73 65 20 6f 6e 65 | 20 6f 66 20 74 68 65 20 | use one| of the |
|00001d30| 66 6f 6c 6c 6f 77 69 6e | 67 20 6f 70 74 69 6f 6e |followin|g option|
|00001d40| 73 2e 20 20 59 6f 75 0a | 73 68 6f 75 6c 64 20 71 |s. You.|should q|
|00001d50| 75 6f 74 65 20 46 4f 52 | 4d 41 54 2c 20 73 69 6e |uote FOR|MAT, sin|
|00001d60| 63 65 20 69 74 20 6f 66 | 74 65 6e 20 63 6f 6e 74 |ce it of|ten cont|
|00001d70| 61 69 6e 73 20 73 68 65 | 6c 6c 20 6d 65 74 61 63 |ains she|ll metac|
|00001d80| 68 61 72 61 63 74 65 72 | 73 2e 0a 0a 60 2d 2d 6f |haracter|s...`--o|
|00001d90| 6c 64 2d 6c 69 6e 65 2d | 66 6f 72 6d 61 74 3d 46 |ld-line-|format=F|
|00001da0| 4f 52 4d 41 54 27 0a 20 | 20 20 20 20 66 6f 72 6d |ORMAT'. | form|
|00001db0| 61 74 73 20 6c 69 6e 65 | 73 20 6a 75 73 74 20 66 |ats line|s just f|
|00001dc0| 72 6f 6d 20 74 68 65 20 | 66 69 72 73 74 20 66 69 |rom the |first fi|
|00001dd0| 6c 65 2e 0a 0a 60 2d 2d | 6e 65 77 2d 6c 69 6e 65 |le...`--|new-line|
|00001de0| 2d 66 6f 72 6d 61 74 3d | 46 4f 52 4d 41 54 27 0a |-format=|FORMAT'.|
|00001df0| 20 20 20 20 20 66 6f 72 | 6d 61 74 73 20 6c 69 6e | for|mats lin|
|00001e00| 65 73 20 6a 75 73 74 20 | 66 72 6f 6d 20 74 68 65 |es just |from the|
|00001e10| 20 73 65 63 6f 6e 64 20 | 66 69 6c 65 2e 0a 0a 60 | second |file...`|
|00001e20| 2d 2d 75 6e 63 68 61 6e | 67 65 64 2d 6c 69 6e 65 |--unchan|ged-line|
|00001e30| 2d 66 6f 72 6d 61 74 3d | 46 4f 52 4d 41 54 27 0a |-format=|FORMAT'.|
|00001e40| 20 20 20 20 20 66 6f 72 | 6d 61 74 73 20 6c 69 6e | for|mats lin|
|00001e50| 65 73 20 63 6f 6d 6d 6f | 6e 20 74 6f 20 62 6f 74 |es commo|n to bot|
|00001e60| 68 20 66 69 6c 65 73 2e | 0a 0a 60 2d 2d 6c 69 6e |h files.|..`--lin|
|00001e70| 65 2d 66 6f 72 6d 61 74 | 3d 46 4f 52 4d 41 54 27 |e-format|=FORMAT'|
|00001e80| 0a 20 20 20 20 20 66 6f | 72 6d 61 74 73 20 61 6c |. fo|rmats al|
|00001e90| 6c 20 6c 69 6e 65 73 3b | 20 69 6e 20 65 66 66 65 |l lines;| in effe|
|00001ea0| 63 74 2c 20 69 74 20 73 | 65 74 73 20 61 6c 6c 20 |ct, it s|ets all |
|00001eb0| 74 68 72 65 65 20 61 62 | 6f 76 65 20 6f 70 74 69 |three ab|ove opti|
|00001ec0| 6f 6e 73 0a 20 20 20 20 | 20 73 69 6d 75 6c 74 61 |ons. | simulta|
|00001ed0| 6e 65 6f 75 73 6c 79 2e | 0a 0a 20 20 20 49 6e 20 |neously.|.. In |
|00001ee0| 61 20 6c 69 6e 65 20 66 | 6f 72 6d 61 74 2c 20 6f |a line f|ormat, o|
|00001ef0| 72 64 69 6e 61 72 79 20 | 63 68 61 72 61 63 74 65 |rdinary |characte|
|00001f00| 72 73 20 72 65 70 72 65 | 73 65 6e 74 20 74 68 65 |rs repre|sent the|
|00001f10| 6d 73 65 6c 76 65 73 3b | 0a 63 6f 6e 76 65 72 73 |mselves;|.convers|
|00001f20| 69 6f 6e 20 73 70 65 63 | 69 66 69 63 61 74 69 6f |ion spec|ificatio|
|00001f30| 6e 73 20 73 74 61 72 74 | 20 77 69 74 68 20 60 25 |ns start| with `%|
|00001f40| 27 20 61 6e 64 20 68 61 | 76 65 20 6f 6e 65 20 6f |' and ha|ve one o|
|00001f50| 66 20 74 68 65 20 66 6f | 6c 6c 6f 77 69 6e 67 0a |f the fo|llowing.|
|00001f60| 66 6f 72 6d 73 2e 0a 0a | 60 25 6c 27 0a 20 20 20 |forms...|`%l'. |
|00001f70| 20 20 73 74 61 6e 64 73 | 20 66 6f 72 20 74 68 65 | stands| for the|
|00001f80| 20 74 68 65 20 63 6f 6e | 74 65 6e 74 73 20 6f 66 | the con|tents of|
|00001f90| 20 74 68 65 20 6c 69 6e | 65 2c 20 6e 6f 74 20 63 | the lin|e, not c|
|00001fa0| 6f 75 6e 74 69 6e 67 20 | 69 74 73 20 74 72 61 69 |ounting |its trai|
|00001fb0| 6c 69 6e 67 0a 20 20 20 | 20 20 6e 65 77 6c 69 6e |ling. | newlin|
|00001fc0| 65 20 28 69 66 20 61 6e | 79 29 2e 20 20 54 68 69 |e (if an|y). Thi|
|00001fd0| 73 20 66 6f 72 6d 61 74 | 20 69 67 6e 6f 72 65 73 |s format| ignores|
|00001fe0| 20 77 68 65 74 68 65 72 | 20 74 68 65 20 6c 69 6e | whether| the lin|
|00001ff0| 65 20 69 73 0a 20 20 20 | 20 20 69 6e 63 6f 6d 70 |e is. | incomp|
|00002000| 6c 65 74 65 3b 20 2a 4e | 6f 74 65 20 49 6e 63 6f |lete; *N|ote Inco|
|00002010| 6d 70 6c 65 74 65 20 4c | 69 6e 65 73 3a 3a 2e 0a |mplete L|ines::..|
|00002020| 0a 60 25 4c 27 0a 20 20 | 20 20 20 73 74 61 6e 64 |.`%L'. | stand|
|00002030| 73 20 66 6f 72 20 74 68 | 65 20 74 68 65 20 63 6f |s for th|e the co|
|00002040| 6e 74 65 6e 74 73 20 6f | 66 20 74 68 65 20 6c 69 |ntents o|f the li|
|00002050| 6e 65 2c 20 69 6e 63 6c | 75 64 69 6e 67 20 69 74 |ne, incl|uding it|
|00002060| 73 20 74 72 61 69 6c 69 | 6e 67 0a 20 20 20 20 20 |s traili|ng. |
|00002070| 6e 65 77 6c 69 6e 65 20 | 28 69 66 20 61 6e 79 29 |newline |(if any)|
|00002080| 2e 20 20 49 66 20 61 20 | 6c 69 6e 65 20 69 73 20 |. If a |line is |
|00002090| 69 6e 63 6f 6d 70 6c 65 | 74 65 2c 20 74 68 69 73 |incomple|te, this|
|000020a0| 20 66 6f 72 6d 61 74 20 | 70 72 65 73 65 72 76 65 | format |preserve|
|000020b0| 73 0a 20 20 20 20 20 69 | 74 73 20 69 6e 63 6f 6d |s. i|ts incom|
|000020c0| 70 6c 65 74 65 6e 65 73 | 73 2e 0a 0a 60 25 25 27 |pletenes|s...`%%'|
|000020d0| 0a 20 20 20 20 20 73 74 | 61 6e 64 73 20 66 6f 72 |. st|ands for|
|000020e0| 20 60 25 27 2e 0a 0a 60 | 25 63 27 43 27 27 0a 20 | `%'...`|%c'C''. |
|000020f0| 20 20 20 20 77 68 65 72 | 65 20 43 20 69 73 20 61 | wher|e C is a|
|00002100| 20 73 69 6e 67 6c 65 20 | 63 68 61 72 61 63 74 65 | single |characte|
|00002110| 72 2c 20 73 74 61 6e 64 | 73 20 66 6f 72 20 43 2e |r, stand|s for C.|
|00002120| 20 20 43 20 6d 61 79 20 | 6e 6f 74 20 62 65 20 61 | C may |not be a|
|00002130| 0a 20 20 20 20 20 62 61 | 63 6b 73 6c 61 73 68 20 |. ba|ckslash |
|00002140| 6f 72 20 61 6e 20 61 70 | 6f 73 74 72 6f 70 68 65 |or an ap|ostrophe|
|00002150| 2e 20 20 46 6f 72 20 65 | 78 61 6d 70 6c 65 2c 20 |. For e|xample, |
|00002160| 60 25 63 27 3a 27 27 20 | 73 74 61 6e 64 73 20 66 |`%c':'' |stands f|
|00002170| 6f 72 20 61 0a 20 20 20 | 20 20 63 6f 6c 6f 6e 2e |or a. | colon.|
|00002180| 0a 0a 60 25 63 27 5c 4f | 27 27 0a 20 20 20 20 20 |..`%c'\O|''. |
|00002190| 77 68 65 72 65 20 4f 20 | 69 73 20 61 20 73 74 72 |where O |is a str|
|000021a0| 69 6e 67 20 6f 66 20 31 | 2c 20 32 2c 20 6f 72 20 |ing of 1|, 2, or |
|000021b0| 33 20 6f 63 74 61 6c 20 | 64 69 67 69 74 73 2c 20 |3 octal |digits, |
|000021c0| 73 74 61 6e 64 73 20 66 | 6f 72 20 74 68 65 0a 20 |stands f|or the. |
|000021d0| 20 20 20 20 63 68 61 72 | 61 63 74 65 72 20 77 69 | char|acter wi|
|000021e0| 74 68 20 6f 63 74 61 6c | 20 63 6f 64 65 20 4f 2e |th octal| code O.|
|000021f0| 20 20 46 6f 72 20 65 78 | 61 6d 70 6c 65 2c 20 60 | For ex|ample, `|
|00002200| 25 63 27 5c 30 27 27 20 | 73 74 61 6e 64 73 20 66 |%c'\0'' |stands f|
|00002210| 6f 72 20 61 0a 20 20 20 | 20 20 6e 75 6c 6c 20 63 |or a. | null c|
|00002220| 68 61 72 61 63 74 65 72 | 2e 0a 0a 60 46 6e 27 0a |haracter|...`Fn'.|
|00002230| 20 20 20 20 20 77 68 65 | 72 65 20 46 20 69 73 20 | whe|re F is |
|00002240| 61 20 60 70 72 69 6e 74 | 66 27 20 63 6f 6e 76 65 |a `print|f' conve|
|00002250| 72 73 69 6f 6e 20 73 70 | 65 63 69 66 69 63 61 74 |rsion sp|ecificat|
|00002260| 69 6f 6e 2c 20 73 74 61 | 6e 64 73 20 66 6f 72 20 |ion, sta|nds for |
|00002270| 74 68 65 0a 20 20 20 20 | 20 6c 69 6e 65 20 6e 75 |the. | line nu|
|00002280| 6d 62 65 72 20 66 6f 72 | 6d 61 74 74 65 64 20 77 |mber for|matted w|
|00002290| 69 74 68 20 46 2e 20 20 | 46 6f 72 20 65 78 61 6d |ith F. |For exam|
|000022a0| 70 6c 65 2c 20 60 25 2e | 35 64 6e 27 20 70 72 69 |ple, `%.|5dn' pri|
|000022b0| 6e 74 73 20 74 68 65 0a | 20 20 20 20 20 6c 69 6e |nts the.| lin|
|000022c0| 65 20 6e 75 6d 62 65 72 | 20 75 73 69 6e 67 20 74 |e number| using t|
|000022d0| 68 65 20 60 70 72 69 6e | 74 66 27 20 66 6f 72 6d |he `prin|tf' form|
|000022e0| 61 74 20 60 22 25 2e 35 | 64 22 27 2e 20 20 2a 4e |at `"%.5|d"'. *N|
|000022f0| 6f 74 65 20 4c 69 6e 65 | 20 47 72 6f 75 70 0a 20 |ote Line| Group. |
|00002300| 20 20 20 20 46 6f 72 6d | 61 74 73 3a 3a 2c 20 66 | Form|ats::, f|
|00002310| 6f 72 20 6d 6f 72 65 20 | 61 62 6f 75 74 20 70 72 |or more |about pr|
|00002320| 69 6e 74 66 20 63 6f 6e | 76 65 72 73 69 6f 6e 20 |intf con|version |
|00002330| 73 70 65 63 69 66 69 63 | 61 74 69 6f 6e 73 2e 0a |specific|ations..|
|00002340| 0a 20 20 20 54 68 65 20 | 64 65 66 61 75 6c 74 20 |. The |default |
|00002350| 6c 69 6e 65 20 66 6f 72 | 6d 61 74 20 69 73 20 60 |line for|mat is `|
|00002360| 25 6c 27 20 66 6f 6c 6c | 6f 77 65 64 20 62 79 20 |%l' foll|owed by |
|00002370| 61 20 6e 65 77 6c 69 6e | 65 20 63 68 61 72 61 63 |a newlin|e charac|
|00002380| 74 65 72 2e 0a 0a 20 20 | 20 49 66 20 74 68 65 20 |ter... | If the |
|00002390| 69 6e 70 75 74 20 63 6f | 6e 74 61 69 6e 73 20 74 |input co|ntains t|
|000023a0| 61 62 20 63 68 61 72 61 | 63 74 65 72 73 20 61 6e |ab chara|cters an|
|000023b0| 64 20 69 74 20 69 73 20 | 69 6d 70 6f 72 74 61 6e |d it is |importan|
|000023c0| 74 20 74 68 61 74 20 74 | 68 65 79 0a 6c 69 6e 65 |t that t|hey.line|
|000023d0| 20 75 70 20 6f 6e 20 6f | 75 74 70 75 74 2c 20 79 | up on o|utput, y|
|000023e0| 6f 75 20 73 68 6f 75 6c | 64 20 65 6e 73 75 72 65 |ou shoul|d ensure|
|000023f0| 20 74 68 61 74 20 60 25 | 6c 27 20 6f 72 20 60 25 | that `%|l' or `%|
|00002400| 4c 27 20 69 6e 20 61 20 | 6c 69 6e 65 20 66 6f 72 |L' in a |line for|
|00002410| 6d 61 74 0a 69 73 20 6a | 75 73 74 20 61 66 74 65 |mat.is j|ust afte|
|00002420| 72 20 61 20 74 61 62 20 | 73 74 6f 70 20 28 65 2e |r a tab |stop (e.|
|00002430| 67 2e 20 62 79 20 70 72 | 65 63 65 64 69 6e 67 20 |g. by pr|eceding |
|00002440| 60 25 6c 27 20 6f 72 20 | 60 25 4c 27 20 77 69 74 |`%l' or |`%L' wit|
|00002450| 68 20 61 20 74 61 62 0a | 63 68 61 72 61 63 74 65 |h a tab.|characte|
|00002460| 72 29 2c 20 6f 72 20 79 | 6f 75 20 73 68 6f 75 6c |r), or y|ou shoul|
|00002470| 64 20 75 73 65 20 74 68 | 65 20 60 2d 74 27 20 6f |d use th|e `-t' o|
|00002480| 72 20 60 2d 2d 65 78 70 | 61 6e 64 2d 74 61 62 73 |r `--exp|and-tabs|
|00002490| 27 20 6f 70 74 69 6f 6e | 2e 0a 0a 20 20 20 54 61 |' option|... Ta|
|000024a0| 6b 65 6e 20 74 6f 67 65 | 74 68 65 72 2c 20 74 68 |ken toge|ther, th|
|000024b0| 65 20 6c 69 6e 65 20 61 | 6e 64 20 6c 69 6e 65 20 |e line a|nd line |
|000024c0| 67 72 6f 75 70 20 66 6f | 72 6d 61 74 73 20 6c 65 |group fo|rmats le|
|000024d0| 74 20 79 6f 75 20 73 70 | 65 63 69 66 79 20 6d 61 |t you sp|ecify ma|
|000024e0| 6e 79 0a 64 69 66 66 65 | 72 65 6e 74 20 66 6f 72 |ny.diffe|rent for|
|000024f0| 6d 61 74 73 2e 20 20 46 | 6f 72 20 65 78 61 6d 70 |mats. F|or examp|
|00002500| 6c 65 2c 20 74 68 65 20 | 66 6f 6c 6c 6f 77 69 6e |le, the |followin|
|00002510| 67 20 63 6f 6d 6d 61 6e | 64 20 75 73 65 73 20 61 |g comman|d uses a|
|00002520| 20 66 6f 72 6d 61 74 0a | 73 69 6d 69 6c 61 72 20 | format.|similar |
|00002530| 74 6f 20 60 64 69 66 66 | 27 27 73 20 6e 6f 72 6d |to `diff|''s norm|
|00002540| 61 6c 20 66 6f 72 6d 61 | 74 2e 20 20 59 6f 75 20 |al forma|t. You |
|00002550| 63 61 6e 20 74 61 69 6c | 6f 72 20 74 68 69 73 20 |can tail|or this |
|00002560| 63 6f 6d 6d 61 6e 64 20 | 74 6f 20 67 65 74 0a 66 |command |to get.f|
|00002570| 69 6e 65 20 63 6f 6e 74 | 72 6f 6c 20 6f 76 65 72 |ine cont|rol over|
|00002580| 20 60 64 69 66 66 27 27 | 73 20 6f 75 74 70 75 74 | `diff''|s output|
|00002590| 2e 0a 0a 20 20 20 20 20 | 64 69 66 66 20 5c 0a 20 |... |diff \. |
|000025a0| 20 20 20 20 20 20 20 2d | 2d 6f 6c 64 2d 6c 69 6e | -|-old-lin|
|000025b0| 65 2d 66 6f 72 6d 61 74 | 3d 27 3c 20 25 6c 0a 20 |e-format|='< %l. |
|000025c0| 20 20 20 20 27 20 5c 0a | 20 20 20 20 20 20 20 20 | ' \.| |
|000025d0| 2d 2d 6e 65 77 2d 6c 69 | 6e 65 2d 66 6f 72 6d 61 |--new-li|ne-forma|
|000025e0| 74 3d 27 3e 20 25 6c 0a | 20 20 20 20 20 27 20 5c |t='> %l.| ' \|
|000025f0| 0a 20 20 20 20 20 20 20 | 20 2d 2d 6f 6c 64 2d 67 |. | --old-g|
|00002600| 72 6f 75 70 2d 66 6f 72 | 6d 61 74 3d 27 25 64 66 |roup-for|mat='%df|
|00002610| 25 28 66 3d 6c 3f 3a 2c | 25 64 6c 29 64 25 64 45 |%(f=l?:,|%dl)d%dE|
|00002620| 0a 20 20 20 20 20 25 3c | 27 20 5c 0a 20 20 20 20 |. %<|' \. |
|00002630| 20 20 20 20 2d 2d 6e 65 | 77 2d 67 72 6f 75 70 2d | --ne|w-group-|
|00002640| 66 6f 72 6d 61 74 3d 27 | 25 64 65 61 25 64 46 25 |format='|%dea%dF%|
|00002650| 28 46 3d 4c 3f 3a 2c 25 | 64 4c 29 0a 20 20 20 20 |(F=L?:,%|dL). |
|00002660| 20 25 3e 27 20 5c 0a 20 | 20 20 20 20 20 20 20 2d | %>' \. | -|
|00002670| 2d 63 68 61 6e 67 65 64 | 2d 67 72 6f 75 70 2d 66 |-changed|-group-f|
|00002680| 6f 72 6d 61 74 3d 27 25 | 64 66 25 28 66 3d 6c 3f |ormat='%|df%(f=l?|
|00002690| 3a 2c 25 64 6c 29 63 25 | 64 46 25 28 46 3d 4c 3f |:,%dl)c%|dF%(F=L?|
|000026a0| 3a 2c 25 64 4c 29 0a 20 | 20 20 20 20 25 3c 2d 2d |:,%dL). | %<--|
|000026b0| 2d 0a 20 20 20 20 20 25 | 3e 27 20 5c 0a 20 20 20 |-. %|>' \. |
|000026c0| 20 20 20 20 20 2d 2d 75 | 6e 63 68 61 6e 67 65 64 | --u|nchanged|
|000026d0| 2d 67 72 6f 75 70 2d 66 | 6f 72 6d 61 74 3d 27 27 |-group-f|ormat=''|
|000026e0| 20 5c 0a 20 20 20 20 20 | 20 20 20 6f 6c 64 20 6e | \. | old n|
|000026f0| 65 77 0a 0a 1f 0a 46 69 | 6c 65 3a 20 64 69 66 66 |ew....Fi|le: diff|
|00002700| 2e 69 6e 66 6f 2c 20 20 | 4e 6f 64 65 3a 20 44 65 |.info, |Node: De|
|00002710| 74 61 69 6c 65 64 20 49 | 66 2d 74 68 65 6e 2d 65 |tailed I|f-then-e|
|00002720| 6c 73 65 2c 20 20 4e 65 | 78 74 3a 20 45 78 61 6d |lse, Ne|xt: Exam|
|00002730| 70 6c 65 20 49 66 2d 74 | 68 65 6e 2d 65 6c 73 65 |ple If-t|hen-else|
|00002740| 2c 20 20 50 72 65 76 3a | 20 4c 69 6e 65 20 46 6f |, Prev:| Line Fo|
|00002750| 72 6d 61 74 73 2c 20 20 | 55 70 3a 20 49 66 2d 74 |rmats, |Up: If-t|
|00002760| 68 65 6e 2d 65 6c 73 65 | 0a 0a 44 65 74 61 69 6c |hen-else|..Detail|
|00002770| 65 64 20 44 65 73 63 72 | 69 70 74 69 6f 6e 20 6f |ed Descr|iption o|
|00002780| 66 20 49 66 2d 74 68 65 | 6e 2d 65 6c 73 65 20 46 |f If-the|n-else F|
|00002790| 6f 72 6d 61 74 0a 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |ormat.--|--------|
|000027a0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000027b0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000027c0| 2d 0a 0a 20 20 20 46 6f | 72 20 6c 69 6e 65 73 20 |-.. Fo|r lines |
|000027d0| 63 6f 6d 6d 6f 6e 20 74 | 6f 20 62 6f 74 68 20 66 |common t|o both f|
|000027e0| 69 6c 65 73 2c 20 60 64 | 69 66 66 27 20 75 73 65 |iles, `d|iff' use|
|000027f0| 73 20 74 68 65 20 75 6e | 63 68 61 6e 67 65 64 20 |s the un|changed |
|00002800| 6c 69 6e 65 20 67 72 6f | 75 70 0a 66 6f 72 6d 61 |line gro|up.forma|
|00002810| 74 2e 20 20 46 6f 72 20 | 65 61 63 68 20 68 75 6e |t. For |each hun|
|00002820| 6b 20 6f 66 20 64 69 66 | 66 65 72 65 6e 63 65 73 |k of dif|ferences|
|00002830| 20 69 6e 20 74 68 65 20 | 6d 65 72 67 65 64 20 6f | in the |merged o|
|00002840| 75 74 70 75 74 20 66 6f | 72 6d 61 74 2c 20 69 66 |utput fo|rmat, if|
|00002850| 0a 74 68 65 20 68 75 6e | 6b 20 63 6f 6e 74 61 69 |.the hun|k contai|
|00002860| 6e 73 20 6f 6e 6c 79 20 | 6c 69 6e 65 73 20 66 72 |ns only |lines fr|
|00002870| 6f 6d 20 74 68 65 20 66 | 69 72 73 74 20 66 69 6c |om the f|irst fil|
|00002880| 65 2c 20 60 64 69 66 66 | 27 20 75 73 65 73 20 74 |e, `diff|' uses t|
|00002890| 68 65 20 6f 6c 64 0a 6c | 69 6e 65 20 67 72 6f 75 |he old.l|ine grou|
|000028a0| 70 20 66 6f 72 6d 61 74 | 3b 20 69 66 20 74 68 65 |p format|; if the|
|000028b0| 20 68 75 6e 6b 20 63 6f | 6e 74 61 69 6e 73 20 6f | hunk co|ntains o|
|000028c0| 6e 6c 79 20 6c 69 6e 65 | 73 20 66 72 6f 6d 20 74 |nly line|s from t|
|000028d0| 68 65 20 73 65 63 6f 6e | 64 0a 66 69 6c 65 2c 20 |he secon|d.file, |
|000028e0| 60 64 69 66 66 27 20 75 | 73 65 73 20 74 68 65 20 |`diff' u|ses the |
|000028f0| 6e 65 77 20 67 72 6f 75 | 70 20 66 6f 72 6d 61 74 |new grou|p format|
|00002900| 3b 20 6f 74 68 65 72 77 | 69 73 65 2c 20 60 64 69 |; otherw|ise, `di|
|00002910| 66 66 27 20 75 73 65 73 | 20 74 68 65 0a 63 68 61 |ff' uses| the.cha|
|00002920| 6e 67 65 64 20 67 72 6f | 75 70 20 66 6f 72 6d 61 |nged gro|up forma|
|00002930| 74 2e 0a 0a 20 20 20 54 | 68 65 20 6f 6c 64 2c 20 |t... T|he old, |
|00002940| 6e 65 77 2c 20 61 6e 64 | 20 75 6e 63 68 61 6e 67 |new, and| unchang|
|00002950| 65 64 20 6c 69 6e 65 20 | 66 6f 72 6d 61 74 73 20 |ed line |formats |
|00002960| 73 70 65 63 69 66 79 20 | 74 68 65 20 6f 75 74 70 |specify |the outp|
|00002970| 75 74 20 66 6f 72 6d 61 | 74 20 6f 66 0a 6c 69 6e |ut forma|t of.lin|
|00002980| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 66 69 72 73 |es from |the firs|
|00002990| 74 20 66 69 6c 65 2c 20 | 6c 69 6e 65 73 20 66 72 |t file, |lines fr|
|000029a0| 6f 6d 20 74 68 65 20 73 | 65 63 6f 6e 64 20 66 69 |om the s|econd fi|
|000029b0| 6c 65 2c 20 61 6e 64 20 | 6c 69 6e 65 73 20 63 6f |le, and |lines co|
|000029c0| 6d 6d 6f 6e 0a 74 6f 20 | 62 6f 74 68 20 66 69 6c |mmon.to |both fil|
|000029d0| 65 73 2c 20 72 65 73 70 | 65 63 74 69 76 65 6c 79 |es, resp|ectively|
|000029e0| 2e 0a 0a 20 20 20 54 68 | 65 20 6f 70 74 69 6f 6e |... Th|e option|
|000029f0| 20 60 2d 2d 69 66 64 65 | 66 3d 4e 41 4d 45 27 20 | `--ifde|f=NAME' |
|00002a00| 69 73 20 65 71 75 69 76 | 61 6c 65 6e 74 20 74 6f |is equiv|alent to|
|00002a10| 20 74 68 65 20 66 6f 6c | 6c 6f 77 69 6e 67 20 73 | the fol|lowing s|
|00002a20| 65 71 75 65 6e 63 65 20 | 6f 66 0a 6f 70 74 69 6f |equence |of.optio|
|00002a30| 6e 73 20 75 73 69 6e 67 | 20 73 68 65 6c 6c 20 73 |ns using| shell s|
|00002a40| 79 6e 74 61 78 3a 0a 0a | 20 20 20 20 20 2d 2d 6f |yntax:..| --o|
|00002a50| 6c 64 2d 67 72 6f 75 70 | 2d 66 6f 72 6d 61 74 3d |ld-group|-format=|
|00002a60| 27 23 69 66 6e 64 65 66 | 20 4e 41 4d 45 0a 20 20 |'#ifndef| NAME. |
|00002a70| 20 20 20 25 3c 23 65 6e | 64 69 66 20 2f 2a 20 6e | %<#en|dif /* n|
|00002a80| 6f 74 20 4e 41 4d 45 20 | 2a 2f 0a 20 20 20 20 20 |ot NAME |*/. |
|00002a90| 27 20 5c 0a 20 20 20 20 | 20 2d 2d 6e 65 77 2d 67 |' \. | --new-g|
|00002aa0| 72 6f 75 70 2d 66 6f 72 | 6d 61 74 3d 27 23 69 66 |roup-for|mat='#if|
|00002ab0| 64 65 66 20 4e 41 4d 45 | 0a 20 20 20 20 20 25 3e |def NAME|. %>|
|00002ac0| 23 65 6e 64 69 66 20 2f | 2a 20 4e 41 4d 45 20 2a |#endif /|* NAME *|
|00002ad0| 2f 0a 20 20 20 20 20 27 | 20 5c 0a 20 20 20 20 20 |/. '| \. |
|00002ae0| 2d 2d 75 6e 63 68 61 6e | 67 65 64 2d 67 72 6f 75 |--unchan|ged-grou|
|00002af0| 70 2d 66 6f 72 6d 61 74 | 3d 27 25 3d 27 20 5c 0a |p-format|='%=' \.|
|00002b00| 20 20 20 20 20 2d 2d 63 | 68 61 6e 67 65 64 2d 67 | --c|hanged-g|
|00002b10| 72 6f 75 70 2d 66 6f 72 | 6d 61 74 3d 27 23 69 66 |roup-for|mat='#if|
|00002b20| 6e 64 65 66 20 4e 41 4d | 45 0a 20 20 20 20 20 25 |ndef NAM|E. %|
|00002b30| 3c 23 65 6c 73 65 20 2f | 2a 20 4e 41 4d 45 20 2a |<#else /|* NAME *|
|00002b40| 2f 0a 20 20 20 20 20 25 | 3e 23 65 6e 64 69 66 20 |/. %|>#endif |
|00002b50| 2f 2a 20 4e 41 4d 45 20 | 2a 2f 0a 20 20 20 20 20 |/* NAME |*/. |
|00002b60| 27 0a 0a 20 20 20 59 6f | 75 20 73 68 6f 75 6c 64 |'.. Yo|u should|
|00002b70| 20 63 61 72 65 66 75 6c | 6c 79 20 63 68 65 63 6b | careful|ly check|
|00002b80| 20 74 68 65 20 60 64 69 | 66 66 27 20 6f 75 74 70 | the `di|ff' outp|
|00002b90| 75 74 20 66 6f 72 20 70 | 72 6f 70 65 72 20 6e 65 |ut for p|roper ne|
|00002ba0| 73 74 69 6e 67 2e 0a 46 | 6f 72 20 65 78 61 6d 70 |sting..F|or examp|
|00002bb0| 6c 65 2c 20 77 68 65 6e | 20 75 73 69 6e 67 20 74 |le, when| using t|
|00002bc0| 68 65 20 74 68 65 20 60 | 2d 44 20 4e 41 4d 45 27 |he the `|-D NAME'|
|00002bd0| 20 6f 72 20 60 2d 2d 69 | 66 64 65 66 3d 4e 41 4d | or `--i|fdef=NAM|
|00002be0| 45 27 20 6f 70 74 69 6f | 6e 2c 20 79 6f 75 0a 73 |E' optio|n, you.s|
|00002bf0| 68 6f 75 6c 64 20 63 68 | 65 63 6b 20 74 68 61 74 |hould ch|eck that|
|00002c00| 20 69 66 20 74 68 65 20 | 64 69 66 66 65 72 69 6e | if the |differin|
|00002c10| 67 20 6c 69 6e 65 73 20 | 63 6f 6e 74 61 69 6e 20 |g lines |contain |
|00002c20| 61 6e 79 20 6f 66 20 74 | 68 65 20 43 0a 70 72 65 |any of t|he C.pre|
|00002c30| 70 72 6f 63 65 73 73 6f | 72 20 64 69 72 65 63 74 |processo|r direct|
|00002c40| 69 76 65 73 20 60 23 69 | 66 64 65 66 27 2c 20 60 |ives `#i|fdef', `|
|00002c50| 23 69 66 6e 64 65 66 27 | 2c 20 60 23 65 6c 73 65 |#ifndef'|, `#else|
|00002c60| 27 2c 20 60 23 65 6c 69 | 66 27 2c 20 6f 72 0a 60 |', `#eli|f', or.`|
|00002c70| 23 65 6e 64 69 66 27 2c | 20 74 68 65 79 20 61 72 |#endif',| they ar|
|00002c80| 65 20 6e 65 73 74 65 64 | 20 70 72 6f 70 65 72 6c |e nested| properl|
|00002c90| 79 20 61 6e 64 20 6d 61 | 74 63 68 2e 20 20 49 66 |y and ma|tch. If|
|00002ca0| 20 74 68 65 79 20 64 6f | 6e 27 74 2c 20 79 6f 75 | they do|n't, you|
|00002cb0| 20 6d 75 73 74 0a 6d 61 | 6b 65 20 63 6f 72 72 65 | must.ma|ke corre|
|00002cc0| 63 74 69 6f 6e 73 20 6d | 61 6e 75 61 6c 6c 79 2e |ctions m|anually.|
|00002cd0| 20 20 49 74 20 69 73 20 | 61 20 67 6f 6f 64 20 69 | It is |a good i|
|00002ce0| 64 65 61 20 74 6f 20 63 | 61 72 65 66 75 6c 6c 79 |dea to c|arefully|
|00002cf0| 20 63 68 65 63 6b 20 74 | 68 65 0a 72 65 73 75 6c | check t|he.resul|
|00002d00| 74 69 6e 67 20 63 6f 64 | 65 20 61 6e 79 77 61 79 |ting cod|e anyway|
|00002d10| 20 74 6f 20 6d 61 6b 65 | 20 73 75 72 65 20 74 68 | to make| sure th|
|00002d20| 61 74 20 69 74 20 72 65 | 61 6c 6c 79 20 64 6f 65 |at it re|ally doe|
|00002d30| 73 20 77 68 61 74 20 79 | 6f 75 20 77 61 6e 74 20 |s what y|ou want |
|00002d40| 69 74 0a 74 6f 3b 20 64 | 65 70 65 6e 64 69 6e 67 |it.to; d|epending|
|00002d50| 20 6f 6e 20 68 6f 77 20 | 74 68 65 20 69 6e 70 75 | on how |the inpu|
|00002d60| 74 20 66 69 6c 65 73 20 | 77 65 72 65 20 70 72 6f |t files |were pro|
|00002d70| 64 75 63 65 64 2c 20 74 | 68 65 20 6f 75 74 70 75 |duced, t|he outpu|
|00002d80| 74 20 6d 69 67 68 74 0a | 63 6f 6e 74 61 69 6e 20 |t might.|contain |
|00002d90| 64 75 70 6c 69 63 61 74 | 65 20 6f 72 20 6f 74 68 |duplicat|e or oth|
|00002da0| 65 72 77 69 73 65 20 69 | 6e 63 6f 72 72 65 63 74 |erwise i|ncorrect|
|00002db0| 20 63 6f 64 65 2e 0a 0a | 20 20 20 54 68 65 20 60 | code...| The `|
|00002dc0| 70 61 74 63 68 27 20 60 | 2d 44 20 4e 41 4d 45 27 |patch' `|-D NAME'|
|00002dd0| 20 6f 70 74 69 6f 6e 20 | 62 65 68 61 76 65 73 20 | option |behaves |
|00002de0| 6a 75 73 74 20 6c 69 6b | 65 20 74 68 65 20 60 64 |just lik|e the `d|
|00002df0| 69 66 66 27 20 60 2d 44 | 20 4e 41 4d 45 27 0a 6f |iff' `-D| NAME'.o|
|00002e00| 70 74 69 6f 6e 2c 20 65 | 78 63 65 70 74 20 69 74 |ption, e|xcept it|
|00002e10| 20 6f 70 65 72 61 74 65 | 73 20 6f 6e 20 61 20 66 | operate|s on a f|
|00002e20| 69 6c 65 20 61 6e 64 20 | 61 20 64 69 66 66 20 74 |ile and |a diff t|
|00002e30| 6f 20 70 72 6f 64 75 63 | 65 20 61 20 6d 65 72 67 |o produc|e a merg|
|00002e40| 65 64 0a 66 69 6c 65 3b | 20 2a 4e 6f 74 65 20 70 |ed.file;| *Note p|
|00002e50| 61 74 63 68 20 4f 70 74 | 69 6f 6e 73 3a 3a 2e 0a |atch Opt|ions::..|
|00002e60| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|00002e70| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 45 78 61 6d 70 |fo, Nod|e: Examp|
|00002e80| 6c 65 20 49 66 2d 74 68 | 65 6e 2d 65 6c 73 65 2c |le If-th|en-else,|
|00002e90| 20 20 50 72 65 76 3a 20 | 44 65 74 61 69 6c 65 64 | Prev: |Detailed|
|00002ea0| 20 49 66 2d 74 68 65 6e | 2d 65 6c 73 65 2c 20 20 | If-then|-else, |
|00002eb0| 55 70 3a 20 49 66 2d 74 | 68 65 6e 2d 65 6c 73 65 |Up: If-t|hen-else|
|00002ec0| 0a 0a 41 6e 20 45 78 61 | 6d 70 6c 65 20 6f 66 20 |..An Exa|mple of |
|00002ed0| 49 66 2d 74 68 65 6e 2d | 65 6c 73 65 20 46 6f 72 |If-then-|else For|
|00002ee0| 6d 61 74 0a 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |mat.----|--------|
|00002ef0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002f00| 2d 2d 2d 2d 2d 0a 0a 20 | 20 20 48 65 72 65 20 69 |-----.. | Here i|
|00002f10| 73 20 74 68 65 20 6f 75 | 74 70 75 74 20 6f 66 20 |s the ou|tput of |
|00002f20| 60 64 69 66 66 20 2d 44 | 54 57 4f 20 6c 61 6f 20 |`diff -D|TWO lao |
|00002f30| 74 7a 75 27 20 28 2a 6e | 6f 74 65 20 53 61 6d 70 |tzu' (*n|ote Samp|
|00002f40| 6c 65 20 64 69 66 66 0a | 49 6e 70 75 74 3a 3a 2e |le diff.|Input::.|
|00002f50| 2c 20 66 6f 72 20 74 68 | 65 20 63 6f 6d 70 6c 65 |, for th|e comple|
|00002f60| 74 65 20 63 6f 6e 74 65 | 6e 74 73 20 6f 66 20 74 |te conte|nts of t|
|00002f70| 68 65 20 74 77 6f 20 66 | 69 6c 65 73 29 3a 0a 0a |he two f|iles):..|
|00002f80| 20 20 20 20 20 23 69 66 | 6e 64 65 66 20 54 57 4f | #if|ndef TWO|
|00002f90| 0a 20 20 20 20 20 54 68 | 65 20 57 61 79 20 74 68 |. Th|e Way th|
|00002fa0| 61 74 20 63 61 6e 20 62 | 65 20 74 6f 6c 64 20 6f |at can b|e told o|
|00002fb0| 66 20 69 73 20 6e 6f 74 | 20 74 68 65 20 65 74 65 |f is not| the ete|
|00002fc0| 72 6e 61 6c 20 57 61 79 | 3b 0a 20 20 20 20 20 54 |rnal Way|;. T|
|00002fd0| 68 65 20 6e 61 6d 65 20 | 74 68 61 74 20 63 61 6e |he name |that can|
|00002fe0| 20 62 65 20 6e 61 6d 65 | 64 20 69 73 20 6e 6f 74 | be name|d is not|
|00002ff0| 20 74 68 65 20 65 74 65 | 72 6e 61 6c 20 6e 61 6d | the ete|rnal nam|
|00003000| 65 2e 0a 20 20 20 20 20 | 23 65 6e 64 69 66 20 2f |e.. |#endif /|
|00003010| 2a 20 6e 6f 74 20 54 57 | 4f 20 2a 2f 0a 20 20 20 |* not TW|O */. |
|00003020| 20 20 54 68 65 20 4e 61 | 6d 65 6c 65 73 73 20 69 | The Na|meless i|
|00003030| 73 20 74 68 65 20 6f 72 | 69 67 69 6e 20 6f 66 20 |s the or|igin of |
|00003040| 48 65 61 76 65 6e 20 61 | 6e 64 20 45 61 72 74 68 |Heaven a|nd Earth|
|00003050| 3b 0a 20 20 20 20 20 23 | 69 66 6e 64 65 66 20 54 |;. #|ifndef T|
|00003060| 57 4f 0a 20 20 20 20 20 | 54 68 65 20 4e 61 6d 65 |WO. |The Name|
|00003070| 64 20 69 73 20 74 68 65 | 20 6d 6f 74 68 65 72 20 |d is the| mother |
|00003080| 6f 66 20 61 6c 6c 20 74 | 68 69 6e 67 73 2e 0a 20 |of all t|hings.. |
|00003090| 20 20 20 20 23 65 6c 73 | 65 20 2f 2a 20 54 57 4f | #els|e /* TWO|
|000030a0| 20 2a 2f 0a 20 20 20 20 | 20 54 68 65 20 6e 61 6d | */. | The nam|
|000030b0| 65 64 20 69 73 20 74 68 | 65 20 6d 6f 74 68 65 72 |ed is th|e mother|
|000030c0| 20 6f 66 20 61 6c 6c 20 | 74 68 69 6e 67 73 2e 0a | of all |things..|
|000030d0| 20 20 20 20 20 0a 20 20 | 20 20 20 23 65 6e 64 69 | . | #endi|
|000030e0| 66 20 2f 2a 20 54 57 4f | 20 2a 2f 0a 20 20 20 20 |f /* TWO| */. |
|000030f0| 20 54 68 65 72 65 66 6f | 72 65 20 6c 65 74 20 74 | Therefo|re let t|
|00003100| 68 65 72 65 20 61 6c 77 | 61 79 73 20 62 65 20 6e |here alw|ays be n|
|00003110| 6f 6e 2d 62 65 69 6e 67 | 2c 0a 20 20 20 20 20 20 |on-being|,. |
|00003120| 20 73 6f 20 77 65 20 6d | 61 79 20 73 65 65 20 74 | so we m|ay see t|
|00003130| 68 65 69 72 20 73 75 62 | 74 6c 65 74 79 2c 0a 20 |heir sub|tlety,. |
|00003140| 20 20 20 20 41 6e 64 20 | 6c 65 74 20 74 68 65 72 | And |let ther|
|00003150| 65 20 61 6c 77 61 79 73 | 20 62 65 20 62 65 69 6e |e always| be bein|
|00003160| 67 2c 0a 20 20 20 20 20 | 20 20 73 6f 20 77 65 20 |g,. | so we |
|00003170| 6d 61 79 20 73 65 65 20 | 74 68 65 69 72 20 6f 75 |may see |their ou|
|00003180| 74 63 6f 6d 65 2e 0a 20 | 20 20 20 20 54 68 65 20 |tcome.. | The |
|00003190| 74 77 6f 20 61 72 65 20 | 74 68 65 20 73 61 6d 65 |two are |the same|
|000031a0| 2c 0a 20 20 20 20 20 42 | 75 74 20 61 66 74 65 72 |,. B|ut after|
|000031b0| 20 74 68 65 79 20 61 72 | 65 20 70 72 6f 64 75 63 | they ar|e produc|
|000031c0| 65 64 2c 0a 20 20 20 20 | 20 20 20 74 68 65 79 20 |ed,. | they |
|000031d0| 68 61 76 65 20 64 69 66 | 66 65 72 65 6e 74 20 6e |have dif|ferent n|
|000031e0| 61 6d 65 73 2e 0a 20 20 | 20 20 20 23 69 66 64 65 |ames.. | #ifde|
|000031f0| 66 20 54 57 4f 0a 20 20 | 20 20 20 54 68 65 79 20 |f TWO. | They |
|00003200| 62 6f 74 68 20 6d 61 79 | 20 62 65 20 63 61 6c 6c |both may| be call|
|00003210| 65 64 20 64 65 65 70 20 | 61 6e 64 20 70 72 6f 66 |ed deep |and prof|
|00003220| 6f 75 6e 64 2e 0a 20 20 | 20 20 20 44 65 65 70 65 |ound.. | Deepe|
|00003230| 72 20 61 6e 64 20 6d 6f | 72 65 20 70 72 6f 66 6f |r and mo|re profo|
|00003240| 75 6e 64 2c 0a 20 20 20 | 20 20 54 68 65 20 64 6f |und,. | The do|
|00003250| 6f 72 20 6f 66 20 61 6c | 6c 20 73 75 62 74 6c 65 |or of al|l subtle|
|00003260| 74 69 65 73 21 0a 20 20 | 20 20 20 23 65 6e 64 69 |ties!. | #endi|
|00003270| 66 20 2f 2a 20 54 57 4f | 20 2a 2f 0a 0a 1f 0a 46 |f /* TWO| */....F|
|00003280| 69 6c 65 3a 20 64 69 66 | 66 2e 69 6e 66 6f 2c 20 |ile: dif|f.info, |
|00003290| 20 4e 6f 64 65 3a 20 43 | 6f 6d 70 61 72 69 6e 67 | Node: C|omparing|
|000032a0| 20 44 69 72 65 63 74 6f | 72 69 65 73 2c 20 20 4e | Directo|ries, N|
|000032b0| 65 78 74 3a 20 41 64 6a | 75 73 74 69 6e 67 20 4f |ext: Adj|usting O|
|000032c0| 75 74 70 75 74 2c 20 20 | 50 72 65 76 3a 20 4f 75 |utput, |Prev: Ou|
|000032d0| 74 70 75 74 20 46 6f 72 | 6d 61 74 73 2c 20 20 55 |tput For|mats, U|
|000032e0| 70 3a 20 54 6f 70 0a 0a | 43 6f 6d 70 61 72 69 6e |p: Top..|Comparin|
|000032f0| 67 20 44 69 72 65 63 74 | 6f 72 69 65 73 0a 2a 2a |g Direct|ories.**|
|00003300| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00003310| 2a 2a 2a 0a 0a 20 20 20 | 59 6f 75 20 63 61 6e 20 |***.. |You can |
|00003320| 75 73 65 20 60 64 69 66 | 66 27 20 74 6f 20 63 6f |use `dif|f' to co|
|00003330| 6d 70 61 72 65 20 73 6f | 6d 65 20 6f 72 20 61 6c |mpare so|me or al|
|00003340| 6c 20 6f 66 20 74 68 65 | 20 66 69 6c 65 73 20 69 |l of the| files i|
|00003350| 6e 20 74 77 6f 0a 64 69 | 72 65 63 74 6f 72 79 20 |n two.di|rectory |
|00003360| 74 72 65 65 73 2e 20 20 | 57 68 65 6e 20 62 6f 74 |trees. |When bot|
|00003370| 68 20 66 69 6c 65 20 6e | 61 6d 65 20 61 72 67 75 |h file n|ame argu|
|00003380| 6d 65 6e 74 73 20 74 6f | 20 60 64 69 66 66 27 20 |ments to| `diff' |
|00003390| 61 72 65 0a 64 69 72 65 | 63 74 6f 72 69 65 73 2c |are.dire|ctories,|
|000033a0| 20 69 74 20 63 6f 6d 70 | 61 72 65 73 20 65 61 63 | it comp|ares eac|
|000033b0| 68 20 66 69 6c 65 20 74 | 68 61 74 20 69 73 20 63 |h file t|hat is c|
|000033c0| 6f 6e 74 61 69 6e 65 64 | 20 69 6e 20 62 6f 74 68 |ontained| in both|
|000033d0| 0a 64 69 72 65 63 74 6f | 72 69 65 73 2c 20 65 78 |.directo|ries, ex|
|000033e0| 61 6d 69 6e 69 6e 67 20 | 66 69 6c 65 20 6e 61 6d |amining |file nam|
|000033f0| 65 73 20 69 6e 20 61 6c | 70 68 61 62 65 74 69 63 |es in al|phabetic|
|00003400| 61 6c 20 6f 72 64 65 72 | 2e 20 20 4e 6f 72 6d 61 |al order|. Norma|
|00003410| 6c 6c 79 0a 60 64 69 66 | 66 27 20 69 73 20 73 69 |lly.`dif|f' is si|
|00003420| 6c 65 6e 74 20 61 62 6f | 75 74 20 70 61 69 72 73 |lent abo|ut pairs|
|00003430| 20 6f 66 20 66 69 6c 65 | 73 20 74 68 61 74 20 63 | of file|s that c|
|00003440| 6f 6e 74 61 69 6e 20 6e | 6f 20 64 69 66 66 65 72 |ontain n|o differ|
|00003450| 65 6e 63 65 73 2c 20 62 | 75 74 0a 69 66 20 79 6f |ences, b|ut.if yo|
|00003460| 75 20 75 73 65 20 74 68 | 65 20 60 2d 73 27 20 6f |u use th|e `-s' o|
|00003470| 72 20 60 2d 2d 72 65 70 | 6f 72 74 2d 69 64 65 6e |r `--rep|ort-iden|
|00003480| 74 69 63 61 6c 2d 66 69 | 6c 65 73 27 20 6f 70 74 |tical-fi|les' opt|
|00003490| 69 6f 6e 2c 20 69 74 20 | 72 65 70 6f 72 74 73 0a |ion, it |reports.|
|000034a0| 70 61 69 72 73 20 6f 66 | 20 69 64 65 6e 74 69 63 |pairs of| identic|
|000034b0| 61 6c 20 66 69 6c 65 73 | 2e 20 20 4e 6f 72 6d 61 |al files|. Norma|
|000034c0| 6c 6c 79 20 60 64 69 66 | 66 27 20 72 65 70 6f 72 |lly `dif|f' repor|
|000034d0| 74 73 20 73 75 62 64 69 | 72 65 63 74 6f 72 69 65 |ts subdi|rectorie|
|000034e0| 73 0a 63 6f 6d 6d 6f 6e | 20 74 6f 20 62 6f 74 68 |s.common| to both|
|000034f0| 20 64 69 72 65 63 74 6f | 72 69 65 73 20 77 69 74 | directo|ries wit|
|00003500| 68 6f 75 74 20 63 6f 6d | 70 61 72 69 6e 67 20 73 |hout com|paring s|
|00003510| 75 62 64 69 72 65 63 74 | 6f 72 69 65 73 27 20 66 |ubdirect|ories' f|
|00003520| 69 6c 65 73 2c 20 62 75 | 74 0a 69 66 20 79 6f 75 |iles, bu|t.if you|
|00003530| 20 75 73 65 20 74 68 65 | 20 60 2d 72 27 20 6f 72 | use the| `-r' or|
|00003540| 20 60 2d 2d 72 65 63 75 | 72 73 69 76 65 27 20 6f | `--recu|rsive' o|
|00003550| 70 74 69 6f 6e 2c 20 69 | 74 20 63 6f 6d 70 61 72 |ption, i|t compar|
|00003560| 65 73 20 65 76 65 72 79 | 0a 63 6f 72 72 65 73 70 |es every|.corresp|
|00003570| 6f 6e 64 69 6e 67 20 70 | 61 69 72 20 6f 66 20 66 |onding p|air of f|
|00003580| 69 6c 65 73 20 69 6e 20 | 74 68 65 20 64 69 72 65 |iles in |the dire|
|00003590| 63 74 6f 72 79 20 74 72 | 65 65 73 2c 20 61 73 20 |ctory tr|ees, as |
|000035a0| 6d 61 6e 79 20 6c 65 76 | 65 6c 73 20 64 65 65 70 |many lev|els deep|
|000035b0| 0a 61 73 20 74 68 65 79 | 20 67 6f 2e 0a 0a 20 20 |.as they| go... |
|000035c0| 20 46 6f 72 20 66 69 6c | 65 20 6e 61 6d 65 73 20 | For fil|e names |
|000035d0| 74 68 61 74 20 61 72 65 | 20 69 6e 20 6f 6e 6c 79 |that are| in only|
|000035e0| 20 6f 6e 65 20 6f 66 20 | 74 68 65 20 64 69 72 65 | one of |the dire|
|000035f0| 63 74 6f 72 69 65 73 2c | 20 60 64 69 66 66 27 0a |ctories,| `diff'.|
|00003600| 6e 6f 72 6d 61 6c 6c 79 | 20 64 6f 65 73 20 6e 6f |normally| does no|
|00003610| 74 20 73 68 6f 77 20 74 | 68 65 20 63 6f 6e 74 65 |t show t|he conte|
|00003620| 6e 74 73 20 6f 66 20 74 | 68 65 20 66 69 6c 65 20 |nts of t|he file |
|00003630| 74 68 61 74 20 65 78 69 | 73 74 73 3b 20 69 74 20 |that exi|sts; it |
|00003640| 72 65 70 6f 72 74 73 0a | 6f 6e 6c 79 20 74 68 61 |reports.|only tha|
|00003650| 74 20 74 68 65 20 66 69 | 6c 65 20 65 78 69 73 74 |t the fi|le exist|
|00003660| 73 20 69 6e 20 74 68 61 | 74 20 64 69 72 65 63 74 |s in tha|t direct|
|00003670| 6f 72 79 20 61 6e 64 20 | 6e 6f 74 20 69 6e 20 74 |ory and |not in t|
|00003680| 68 65 20 6f 74 68 65 72 | 2e 20 20 59 6f 75 0a 63 |he other|. You.c|
|00003690| 61 6e 20 6d 61 6b 65 20 | 60 64 69 66 66 27 20 61 |an make |`diff' a|
|000036a0| 63 74 20 61 73 20 74 68 | 6f 75 67 68 20 74 68 65 |ct as th|ough the|
|000036b0| 20 66 69 6c 65 20 65 78 | 69 73 74 65 64 20 62 75 | file ex|isted bu|
|000036c0| 74 20 77 61 73 20 65 6d | 70 74 79 20 69 6e 20 74 |t was em|pty in t|
|000036d0| 68 65 0a 6f 74 68 65 72 | 20 64 69 72 65 63 74 6f |he.other| directo|
|000036e0| 72 79 2c 20 73 6f 20 74 | 68 61 74 20 69 74 20 6f |ry, so t|hat it o|
|000036f0| 75 74 70 75 74 73 20 74 | 68 65 20 65 6e 74 69 72 |utputs t|he entir|
|00003700| 65 20 63 6f 6e 74 65 6e | 74 73 20 6f 66 20 74 68 |e conten|ts of th|
|00003710| 65 20 66 69 6c 65 20 74 | 68 61 74 0a 61 63 74 75 |e file t|hat.actu|
|00003720| 61 6c 6c 79 20 65 78 69 | 73 74 73 2e 20 20 28 49 |ally exi|sts. (I|
|00003730| 74 20 69 73 20 6f 75 74 | 70 75 74 20 61 73 20 65 |t is out|put as e|
|00003740| 69 74 68 65 72 20 61 6e | 20 69 6e 73 65 72 74 69 |ither an| inserti|
|00003750| 6f 6e 20 6f 72 20 61 20 | 64 65 6c 65 74 69 6f 6e |on or a |deletion|
|00003760| 2c 0a 64 65 70 65 6e 64 | 69 6e 67 20 6f 6e 20 77 |,.depend|ing on w|
|00003770| 68 65 74 68 65 72 20 69 | 74 20 69 73 20 69 6e 20 |hether i|t is in |
|00003780| 74 68 65 20 66 69 72 73 | 74 20 6f 72 20 74 68 65 |the firs|t or the|
|00003790| 20 73 65 63 6f 6e 64 20 | 64 69 72 65 63 74 6f 72 | second |director|
|000037a0| 79 20 67 69 76 65 6e 2e | 29 0a 54 6f 20 64 6f 20 |y given.|).To do |
|000037b0| 74 68 69 73 2c 20 75 73 | 65 20 74 68 65 20 60 2d |this, us|e the `-|
|000037c0| 4e 27 20 6f 72 20 60 2d | 2d 6e 65 77 2d 66 69 6c |N' or `-|-new-fil|
|000037d0| 65 27 20 6f 70 74 69 6f | 6e 2e 0a 0a 20 20 20 49 |e' optio|n... I|
|000037e0| 66 20 74 68 65 20 6f 6c | 64 65 72 20 64 69 72 65 |f the ol|der dire|
|000037f0| 63 74 6f 72 79 20 63 6f | 6e 74 61 69 6e 73 20 6f |ctory co|ntains o|
|00003800| 6e 65 20 6f 72 20 6d 6f | 72 65 20 6c 61 72 67 65 |ne or mo|re large|
|00003810| 20 66 69 6c 65 73 20 74 | 68 61 74 20 61 72 65 20 | files t|hat are |
|00003820| 6e 6f 74 0a 69 6e 20 74 | 68 65 20 6e 65 77 65 72 |not.in t|he newer|
|00003830| 20 64 69 72 65 63 74 6f | 72 79 2c 20 79 6f 75 20 | directo|ry, you |
|00003840| 63 61 6e 20 6d 61 6b 65 | 20 74 68 65 20 70 61 74 |can make| the pat|
|00003850| 63 68 20 73 6d 61 6c 6c | 65 72 20 62 79 20 75 73 |ch small|er by us|
|00003860| 69 6e 67 20 74 68 65 0a | 60 2d 50 27 20 6f 72 20 |ing the.|`-P' or |
|00003870| 60 2d 2d 75 6e 69 64 69 | 72 65 63 74 69 6f 6e 61 |`--unidi|rectiona|
|00003880| 6c 2d 6e 65 77 2d 66 69 | 6c 65 27 20 6f 70 74 69 |l-new-fi|le' opti|
|00003890| 6f 6e 20 69 6e 73 74 65 | 61 64 20 6f 66 20 60 2d |on inste|ad of `-|
|000038a0| 4e 27 2e 20 20 54 68 69 | 73 0a 6f 70 74 69 6f 6e |N'. Thi|s.option|
|000038b0| 20 69 73 20 6c 69 6b 65 | 20 60 2d 4e 27 20 65 78 | is like| `-N' ex|
|000038c0| 63 65 70 74 20 74 68 61 | 74 20 69 74 20 6f 6e 6c |cept tha|t it onl|
|000038d0| 79 20 69 6e 73 65 72 74 | 73 20 74 68 65 20 63 6f |y insert|s the co|
|000038e0| 6e 74 65 6e 74 73 20 6f | 66 20 66 69 6c 65 73 0a |ntents o|f files.|
|000038f0| 74 68 61 74 20 61 70 70 | 65 61 72 20 69 6e 20 74 |that app|ear in t|
|00003900| 68 65 20 73 65 63 6f 6e | 64 20 64 69 72 65 63 74 |he secon|d direct|
|00003910| 6f 72 79 20 62 75 74 20 | 6e 6f 74 20 74 68 65 20 |ory but |not the |
|00003920| 66 69 72 73 74 20 28 74 | 68 61 74 20 69 73 2c 20 |first (t|hat is, |
|00003930| 66 69 6c 65 73 0a 74 68 | 61 74 20 77 65 72 65 20 |files.th|at were |
|00003940| 61 64 64 65 64 29 2e 20 | 20 41 74 20 74 68 65 20 |added). | At the |
|00003950| 74 6f 70 20 6f 66 20 74 | 68 65 20 70 61 74 63 68 |top of t|he patch|
|00003960| 2c 20 77 72 69 74 65 20 | 69 6e 73 74 72 75 63 74 |, write |instruct|
|00003970| 69 6f 6e 73 20 66 6f 72 | 20 74 68 65 0a 75 73 65 |ions for| the.use|
|00003980| 72 20 61 70 70 6c 79 69 | 6e 67 20 74 68 65 20 70 |r applyi|ng the p|
|00003990| 61 74 63 68 20 74 6f 20 | 72 65 6d 6f 76 65 20 74 |atch to |remove t|
|000039a0| 68 65 20 66 69 6c 65 73 | 20 74 68 61 74 20 77 65 |he files| that we|
|000039b0| 72 65 20 64 65 6c 65 74 | 65 64 20 62 65 66 6f 72 |re delet|ed befor|
|000039c0| 65 0a 61 70 70 6c 79 69 | 6e 67 20 74 68 65 20 70 |e.applyi|ng the p|
|000039d0| 61 74 63 68 2e 20 20 2a | 4e 6f 74 65 20 4d 61 6b |atch. *|Note Mak|
|000039e0| 69 6e 67 20 50 61 74 63 | 68 65 73 3a 3a 2c 20 66 |ing Patc|hes::, f|
|000039f0| 6f 72 20 6d 6f 72 65 20 | 64 69 73 63 75 73 73 69 |or more |discussi|
|00003a00| 6f 6e 20 6f 66 0a 6d 61 | 6b 69 6e 67 20 70 61 74 |on of.ma|king pat|
|00003a10| 63 68 65 73 20 66 6f 72 | 20 64 69 73 74 72 69 62 |ches for| distrib|
|00003a20| 75 74 69 6f 6e 2e 0a 0a | 20 20 20 54 6f 20 69 67 |ution...| To ig|
|00003a30| 6e 6f 72 65 20 73 6f 6d | 65 20 66 69 6c 65 73 20 |nore som|e files |
|00003a40| 77 68 69 6c 65 20 63 6f | 6d 70 61 72 69 6e 67 20 |while co|mparing |
|00003a50| 64 69 72 65 63 74 6f 72 | 69 65 73 2c 20 75 73 65 |director|ies, use|
|00003a60| 20 74 68 65 20 60 2d 78 | 0a 50 41 54 54 45 52 4e | the `-x|.PATTERN|
|00003a70| 27 20 6f 72 20 60 2d 2d | 65 78 63 6c 75 64 65 3d |' or `--|exclude=|
|00003a80| 50 41 54 54 45 52 4e 27 | 20 6f 70 74 69 6f 6e 2e |PATTERN'| option.|
|00003a90| 20 20 54 68 69 73 20 6f | 70 74 69 6f 6e 20 69 67 | This o|ption ig|
|00003aa0| 6e 6f 72 65 73 20 61 6e | 79 20 66 69 6c 65 73 0a |nores an|y files.|
|00003ab0| 6f 72 20 73 75 62 64 69 | 72 65 63 74 6f 72 69 65 |or subdi|rectorie|
|00003ac0| 73 20 77 68 6f 73 65 20 | 62 61 73 65 20 6e 61 6d |s whose |base nam|
|00003ad0| 65 73 20 6d 61 74 63 68 | 20 74 68 65 20 73 68 65 |es match| the she|
|00003ae0| 6c 6c 20 70 61 74 74 65 | 72 6e 20 50 41 54 54 45 |ll patte|rn PATTE|
|00003af0| 52 4e 2e 0a 55 6e 6c 69 | 6b 65 20 69 6e 20 74 68 |RN..Unli|ke in th|
|00003b00| 65 20 73 68 65 6c 6c 2c | 20 61 20 70 65 72 69 6f |e shell,| a perio|
|00003b10| 64 20 61 74 20 74 68 65 | 20 73 74 61 72 74 20 6f |d at the| start o|
|00003b20| 66 20 74 68 65 20 62 61 | 73 65 20 6f 66 20 61 20 |f the ba|se of a |
|00003b30| 66 69 6c 65 20 6e 61 6d | 65 0a 6d 61 74 63 68 65 |file nam|e.matche|
|00003b40| 73 20 61 20 77 69 6c 64 | 63 61 72 64 20 61 74 20 |s a wild|card at |
|00003b50| 74 68 65 20 73 74 61 72 | 74 20 6f 66 20 61 20 70 |the star|t of a p|
|00003b60| 61 74 74 65 72 6e 2e 20 | 20 59 6f 75 20 73 68 6f |attern. | You sho|
|00003b70| 75 6c 64 20 65 6e 63 6c | 6f 73 65 0a 50 41 54 54 |uld encl|ose.PATT|
|00003b80| 45 52 4e 20 69 6e 20 71 | 75 6f 74 65 73 20 73 6f |ERN in q|uotes so|
|00003b90| 20 74 68 61 74 20 74 68 | 65 20 73 68 65 6c 6c 20 | that th|e shell |
|00003ba0| 64 6f 65 73 20 6e 6f 74 | 20 65 78 70 61 6e 64 20 |does not| expand |
|00003bb0| 69 74 2e 20 20 46 6f 72 | 20 65 78 61 6d 70 6c 65 |it. For| example|
|00003bc0| 2c 0a 74 68 65 20 6f 70 | 74 69 6f 6e 20 60 2d 78 |,.the op|tion `-x|
|00003bd0| 20 27 2a 2e 5b 61 6f 5d | 27 27 20 69 67 6e 6f 72 | '*.[ao]|'' ignor|
|00003be0| 65 73 20 61 6e 79 20 66 | 69 6c 65 20 77 68 6f 73 |es any f|ile whos|
|00003bf0| 65 20 6e 61 6d 65 20 65 | 6e 64 73 20 77 69 74 68 |e name e|nds with|
|00003c00| 20 60 2e 61 27 20 6f 72 | 0a 60 2e 6f 27 2e 0a 0a | `.a' or|.`.o'...|
|00003c10| 20 20 20 54 68 69 73 20 | 6f 70 74 69 6f 6e 20 61 | This |option a|
|00003c20| 63 63 75 6d 75 6c 61 74 | 65 73 20 69 66 20 79 6f |ccumulat|es if yo|
|00003c30| 75 20 73 70 65 63 69 66 | 79 20 69 74 20 6d 6f 72 |u specif|y it mor|
|00003c40| 65 20 74 68 61 6e 20 6f | 6e 63 65 2e 20 20 46 6f |e than o|nce. Fo|
|00003c50| 72 0a 65 78 61 6d 70 6c | 65 2c 20 75 73 69 6e 67 |r.exampl|e, using|
|00003c60| 20 74 68 65 20 6f 70 74 | 69 6f 6e 73 20 60 2d 78 | the opt|ions `-x|
|00003c70| 20 27 52 43 53 27 20 2d | 78 20 27 2a 2c 76 27 27 | 'RCS' -|x '*,v''|
|00003c80| 20 69 67 6e 6f 72 65 73 | 20 61 6e 79 20 66 69 6c | ignores| any fil|
|00003c90| 65 20 6f 72 0a 73 75 62 | 64 69 72 65 63 74 6f 72 |e or.sub|director|
|00003ca0| 79 20 77 68 6f 73 65 20 | 62 61 73 65 20 6e 61 6d |y whose |base nam|
|00003cb0| 65 20 69 73 20 60 52 43 | 53 27 20 6f 72 20 65 6e |e is `RC|S' or en|
|00003cc0| 64 73 20 77 69 74 68 20 | 60 2c 76 27 2e 0a 0a 20 |ds with |`,v'... |
|00003cd0| 20 20 49 66 20 79 6f 75 | 20 6e 65 65 64 20 74 6f | If you| need to|
|00003ce0| 20 67 69 76 65 20 74 68 | 69 73 20 6f 70 74 69 6f | give th|is optio|
|00003cf0| 6e 20 6d 61 6e 79 20 74 | 69 6d 65 73 2c 20 79 6f |n many t|imes, yo|
|00003d00| 75 20 63 61 6e 20 69 6e | 73 74 65 61 64 20 70 75 |u can in|stead pu|
|00003d10| 74 20 74 68 65 0a 70 61 | 74 74 65 72 6e 73 20 69 |t the.pa|tterns i|
|00003d20| 6e 20 61 20 66 69 6c 65 | 2c 20 6f 6e 65 20 70 61 |n a file|, one pa|
|00003d30| 74 74 65 72 6e 20 70 65 | 72 20 6c 69 6e 65 2c 20 |ttern pe|r line, |
|00003d40| 61 6e 64 20 75 73 65 20 | 74 68 65 20 60 2d 58 20 |and use |the `-X |
|00003d50| 46 49 4c 45 27 20 6f 72 | 0a 60 2d 2d 65 78 63 6c |FILE' or|.`--excl|
|00003d60| 75 64 65 2d 66 72 6f 6d | 3d 46 49 4c 45 27 20 6f |ude-from|=FILE' o|
|00003d70| 70 74 69 6f 6e 2e 0a 0a | 20 20 20 49 66 20 79 6f |ption...| If yo|
|00003d80| 75 20 68 61 76 65 20 62 | 65 65 6e 20 63 6f 6d 70 |u have b|een comp|
|00003d90| 61 72 69 6e 67 20 74 77 | 6f 20 64 69 72 65 63 74 |aring tw|o direct|
|00003da0| 6f 72 69 65 73 20 61 6e | 64 20 73 74 6f 70 70 65 |ories an|d stoppe|
|00003db0| 64 20 70 61 72 74 77 61 | 79 0a 74 68 72 6f 75 67 |d partwa|y.throug|
|00003dc0| 68 2c 20 6c 61 74 65 72 | 20 79 6f 75 20 6d 69 67 |h, later| you mig|
|00003dd0| 68 74 20 77 61 6e 74 20 | 74 6f 20 63 6f 6e 74 69 |ht want |to conti|
|00003de0| 6e 75 65 20 77 68 65 72 | 65 20 79 6f 75 20 6c 65 |nue wher|e you le|
|00003df0| 66 74 20 6f 66 66 2e 20 | 20 59 6f 75 20 63 61 6e |ft off. | You can|
|00003e00| 0a 64 6f 20 74 68 69 73 | 20 62 79 20 75 73 69 6e |.do this| by usin|
|00003e10| 67 20 74 68 65 20 60 2d | 53 20 46 49 4c 45 27 20 |g the `-|S FILE' |
|00003e20| 6f 72 20 60 2d 2d 73 74 | 61 72 74 69 6e 67 2d 66 |or `--st|arting-f|
|00003e30| 69 6c 65 3d 46 49 4c 45 | 27 20 6f 70 74 69 6f 6e |ile=FILE|' option|
|00003e40| 2e 20 20 54 68 69 73 0a | 63 6f 6d 70 61 72 65 73 |. This.|compares|
|00003e50| 20 6f 6e 6c 79 20 74 68 | 65 20 66 69 6c 65 20 46 | only th|e file F|
|00003e60| 49 4c 45 20 61 6e 64 20 | 61 6c 6c 20 61 6c 70 68 |ILE and |all alph|
|00003e70| 61 62 65 74 69 63 61 6c | 6c 79 20 6c 61 74 65 72 |abetical|ly later|
|00003e80| 20 66 69 6c 65 73 20 69 | 6e 20 74 68 65 0a 74 6f | files i|n the.to|
|00003e90| 70 6d 6f 73 74 20 64 69 | 72 65 63 74 6f 72 79 20 |pmost di|rectory |
|00003ea0| 6c 65 76 65 6c 2e 0a 0a | 1f 0a 46 69 6c 65 3a 20 |level...|..File: |
|00003eb0| 64 69 66 66 2e 69 6e 66 | 6f 2c 20 20 4e 6f 64 65 |diff.inf|o, Node|
|00003ec0| 3a 20 41 64 6a 75 73 74 | 69 6e 67 20 4f 75 74 70 |: Adjust|ing Outp|
|00003ed0| 75 74 2c 20 20 4e 65 78 | 74 3a 20 64 69 66 66 20 |ut, Nex|t: diff |
|00003ee0| 50 65 72 66 6f 72 6d 61 | 6e 63 65 2c 20 20 50 72 |Performa|nce, Pr|
|00003ef0| 65 76 3a 20 43 6f 6d 70 | 61 72 69 6e 67 20 44 69 |ev: Comp|aring Di|
|00003f00| 72 65 63 74 6f 72 69 65 | 73 2c 20 20 55 70 3a 20 |rectorie|s, Up: |
|00003f10| 54 6f 70 0a 0a 4d 61 6b | 69 6e 67 20 60 64 69 66 |Top..Mak|ing `dif|
|00003f20| 66 27 20 4f 75 74 70 75 | 74 20 50 72 65 74 74 69 |f' Outpu|t Pretti|
|00003f30| 65 72 0a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |er.*****|********|
|00003f40| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00003f50| 0a 0a 20 20 20 60 64 69 | 66 66 27 20 70 72 6f 76 |.. `di|ff' prov|
|00003f60| 69 64 65 73 20 73 65 76 | 65 72 61 6c 20 77 61 79 |ides sev|eral way|
|00003f70| 73 20 74 6f 20 61 64 6a | 75 73 74 20 74 68 65 20 |s to adj|ust the |
|00003f80| 61 70 70 65 61 72 61 6e | 63 65 20 6f 66 20 69 74 |appearan|ce of it|
|00003f90| 73 20 6f 75 74 70 75 74 | 2e 0a 54 68 65 73 65 20 |s output|..These |
|00003fa0| 61 64 6a 75 73 74 6d 65 | 6e 74 73 20 63 61 6e 20 |adjustme|nts can |
|00003fb0| 62 65 20 61 70 70 6c 69 | 65 64 20 74 6f 20 61 6e |be appli|ed to an|
|00003fc0| 79 20 6f 75 74 70 75 74 | 20 66 6f 72 6d 61 74 2e |y output| format.|
|00003fd0| 0a 0a 2a 20 4d 65 6e 75 | 3a 0a 0a 2a 20 54 61 62 |..* Menu|:..* Tab|
|00003fe0| 73 3a 3a 09 09 50 72 65 | 73 65 72 76 69 6e 67 20 |s::..Pre|serving |
|00003ff0| 74 68 65 20 61 6c 69 67 | 6e 6d 65 6e 74 20 6f 66 |the alig|nment of|
|00004000| 20 74 61 62 73 74 6f 70 | 73 2e 0a 2a 20 50 61 67 | tabstop|s..* Pag|
|00004010| 69 6e 61 74 69 6f 6e 3a | 3a 09 09 50 61 67 65 20 |ination:|:..Page |
|00004020| 6e 75 6d 62 65 72 69 6e | 67 20 61 6e 64 20 74 69 |numberin|g and ti|
|00004030| 6d 65 73 74 61 6d 70 69 | 6e 67 20 60 64 69 66 66 |mestampi|ng `diff|
|00004040| 27 20 6f 75 74 70 75 74 | 2e 0a 0a 1f 0a 46 69 6c |' output|.....Fil|
|00004050| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|00004060| 6f 64 65 3a 20 54 61 62 | 73 2c 20 20 4e 65 78 74 |ode: Tab|s, Next|
|00004070| 3a 20 50 61 67 69 6e 61 | 74 69 6f 6e 2c 20 20 55 |: Pagina|tion, U|
|00004080| 70 3a 20 41 64 6a 75 73 | 74 69 6e 67 20 4f 75 74 |p: Adjus|ting Out|
|00004090| 70 75 74 0a 0a 50 72 65 | 73 65 72 76 69 6e 67 20 |put..Pre|serving |
|000040a0| 54 61 62 73 74 6f 70 20 | 41 6c 69 67 6e 6d 65 6e |Tabstop |Alignmen|
|000040b0| 74 0a 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |t.======|========|
|000040c0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 0a 0a |========|======..|
|000040d0| 20 20 20 54 68 65 20 6c | 69 6e 65 73 20 6f 66 20 | The l|ines of |
|000040e0| 74 65 78 74 20 69 6e 20 | 73 6f 6d 65 20 6f 66 20 |text in |some of |
|000040f0| 74 68 65 20 60 64 69 66 | 66 27 20 6f 75 74 70 75 |the `dif|f' outpu|
|00004100| 74 20 66 6f 72 6d 61 74 | 73 20 61 72 65 20 70 72 |t format|s are pr|
|00004110| 65 63 65 64 65 64 0a 62 | 79 20 6f 6e 65 20 6f 72 |eceded.b|y one or|
|00004120| 20 74 77 6f 20 63 68 61 | 72 61 63 74 65 72 73 20 | two cha|racters |
|00004130| 74 68 61 74 20 69 6e 64 | 69 63 61 74 65 20 77 68 |that ind|icate wh|
|00004140| 65 74 68 65 72 20 74 68 | 65 20 74 65 78 74 20 69 |ether th|e text i|
|00004150| 73 20 69 6e 73 65 72 74 | 65 64 2c 0a 64 65 6c 65 |s insert|ed,.dele|
|00004160| 74 65 64 2c 20 6f 72 20 | 63 68 61 6e 67 65 64 2e |ted, or |changed.|
|00004170| 20 20 54 68 65 20 61 64 | 64 69 74 69 6f 6e 20 6f | The ad|dition o|
|00004180| 66 20 74 68 6f 73 65 20 | 63 68 61 72 61 63 74 65 |f those |characte|
|00004190| 72 73 20 63 61 6e 20 63 | 61 75 73 65 20 74 61 62 |rs can c|ause tab|
|000041a0| 73 20 74 6f 0a 6d 6f 76 | 65 20 74 6f 20 74 68 65 |s to.mov|e to the|
|000041b0| 20 6e 65 78 74 20 74 61 | 62 73 74 6f 70 2c 20 74 | next ta|bstop, t|
|000041c0| 68 72 6f 77 69 6e 67 20 | 6f 66 66 20 74 68 65 20 |hrowing |off the |
|000041d0| 61 6c 69 67 6e 6d 65 6e | 74 20 6f 66 20 63 6f 6c |alignmen|t of col|
|000041e0| 75 6d 6e 73 20 69 6e 20 | 74 68 65 0a 6c 69 6e 65 |umns in |the.line|
|000041f0| 2e 20 20 47 4e 55 20 60 | 64 69 66 66 27 20 70 72 |. GNU `|diff' pr|
|00004200| 6f 76 69 64 65 73 20 74 | 77 6f 20 77 61 79 73 20 |ovides t|wo ways |
|00004210| 74 6f 20 6d 61 6b 65 20 | 74 61 62 2d 61 6c 69 67 |to make |tab-alig|
|00004220| 6e 65 64 20 63 6f 6c 75 | 6d 6e 73 20 6c 69 6e 65 |ned colu|mns line|
|00004230| 20 75 70 0a 63 6f 72 72 | 65 63 74 6c 79 2e 0a 0a | up.corr|ectly...|
|00004240| 20 20 20 54 68 65 20 66 | 69 72 73 74 20 77 61 79 | The f|irst way|
|00004250| 20 69 73 20 74 6f 20 68 | 61 76 65 20 60 64 69 66 | is to h|ave `dif|
|00004260| 66 27 20 63 6f 6e 76 65 | 72 74 20 61 6c 6c 20 74 |f' conve|rt all t|
|00004270| 61 62 73 20 69 6e 74 6f | 20 74 68 65 20 63 6f 72 |abs into| the cor|
|00004280| 72 65 63 74 0a 6e 75 6d | 62 65 72 20 6f 66 20 73 |rect.num|ber of s|
|00004290| 70 61 63 65 73 20 62 65 | 66 6f 72 65 20 6f 75 74 |paces be|fore out|
|000042a0| 70 75 74 74 69 6e 67 20 | 74 68 65 6d 3b 20 73 65 |putting |them; se|
|000042b0| 6c 65 63 74 20 74 68 69 | 73 20 6d 65 74 68 6f 64 |lect thi|s method|
|000042c0| 20 77 69 74 68 20 74 68 | 65 0a 60 2d 74 27 20 6f | with th|e.`-t' o|
|000042d0| 72 20 60 2d 2d 65 78 70 | 61 6e 64 2d 74 61 62 73 |r `--exp|and-tabs|
|000042e0| 27 20 6f 70 74 69 6f 6e | 2e 20 20 60 64 69 66 66 |' option|. `diff|
|000042f0| 27 20 61 73 73 75 6d 65 | 73 20 74 68 61 74 20 74 |' assume|s that t|
|00004300| 61 62 73 74 6f 70 73 20 | 61 72 65 20 73 65 74 0a |abstops |are set.|
|00004310| 65 76 65 72 79 20 38 20 | 63 6f 6c 75 6d 6e 73 2e |every 8 |columns.|
|00004320| 20 20 54 6f 20 75 73 65 | 20 74 68 69 73 20 66 6f | To use| this fo|
|00004330| 72 6d 20 6f 66 20 6f 75 | 74 70 75 74 20 77 69 74 |rm of ou|tput wit|
|00004340| 68 20 60 70 61 74 63 68 | 27 2c 20 79 6f 75 20 6d |h `patch|', you m|
|00004350| 75 73 74 0a 67 69 76 65 | 20 60 70 61 74 63 68 27 |ust.give| `patch'|
|00004360| 20 74 68 65 20 60 2d 6c | 27 20 6f 72 20 60 2d 2d | the `-l|' or `--|
|00004370| 69 67 6e 6f 72 65 2d 77 | 68 69 74 65 2d 73 70 61 |ignore-w|hite-spa|
|00004380| 63 65 27 20 6f 70 74 69 | 6f 6e 20 28 2a 6e 6f 74 |ce' opti|on (*not|
|00004390| 65 20 43 68 61 6e 67 65 | 64 0a 57 68 69 74 65 20 |e Change|d.White |
|000043a0| 53 70 61 63 65 3a 3a 2e | 2c 20 66 6f 72 20 6d 6f |Space::.|, for mo|
|000043b0| 72 65 20 69 6e 66 6f 72 | 6d 61 74 69 6f 6e 29 2e |re infor|mation).|
|000043c0| 0a 0a 20 20 20 54 68 65 | 20 6f 74 68 65 72 20 6d |.. The| other m|
|000043d0| 65 74 68 6f 64 20 66 6f | 72 20 6d 61 6b 69 6e 67 |ethod fo|r making|
|000043e0| 20 74 61 62 73 20 6c 69 | 6e 65 20 75 70 20 63 6f | tabs li|ne up co|
|000043f0| 72 72 65 63 74 6c 79 20 | 69 73 20 74 6f 20 61 64 |rrectly |is to ad|
|00004400| 64 20 61 20 74 61 62 0a | 63 68 61 72 61 63 74 65 |d a tab.|characte|
|00004410| 72 20 69 6e 73 74 65 61 | 64 20 6f 66 20 61 20 73 |r instea|d of a s|
|00004420| 70 61 63 65 20 61 66 74 | 65 72 20 74 68 65 20 69 |pace aft|er the i|
|00004430| 6e 64 69 63 61 74 6f 72 | 20 63 68 61 72 61 63 74 |ndicator| charact|
|00004440| 65 72 20 61 74 20 74 68 | 65 0a 62 65 67 69 6e 6e |er at th|e.beginn|
|00004450| 69 6e 67 20 6f 66 20 74 | 68 65 20 6c 69 6e 65 2e |ing of t|he line.|
|00004460| 20 20 54 68 69 73 20 65 | 6e 73 75 72 65 73 20 74 | This e|nsures t|
|00004470| 68 61 74 20 61 6c 6c 20 | 66 6f 6c 6c 6f 77 69 6e |hat all |followin|
|00004480| 67 20 74 61 62 20 63 68 | 61 72 61 63 74 65 72 73 |g tab ch|aracters|
|00004490| 0a 61 72 65 20 69 6e 20 | 74 68 65 20 73 61 6d 65 |.are in |the same|
|000044a0| 20 70 6f 73 69 74 69 6f | 6e 20 72 65 6c 61 74 69 | positio|n relati|
|000044b0| 76 65 20 74 6f 20 74 61 | 62 73 74 6f 70 73 20 74 |ve to ta|bstops t|
|000044c0| 68 61 74 20 74 68 65 79 | 20 77 65 72 65 20 69 6e |hat they| were in|
|000044d0| 20 74 68 65 0a 6f 72 69 | 67 69 6e 61 6c 20 66 69 | the.ori|ginal fi|
|000044e0| 6c 65 73 2c 20 73 6f 20 | 74 68 61 74 20 74 68 65 |les, so |that the|
|000044f0| 20 6f 75 74 70 75 74 20 | 69 73 20 61 6c 69 67 6e | output |is align|
|00004500| 65 64 20 63 6f 72 72 65 | 63 74 6c 79 2e 20 20 49 |ed corre|ctly. I|
|00004510| 74 73 0a 64 69 73 61 64 | 76 61 6e 74 61 67 65 20 |ts.disad|vantage |
|00004520| 69 73 20 74 68 61 74 20 | 69 74 20 63 61 6e 20 6d |is that |it can m|
|00004530| 61 6b 65 20 6c 6f 6e 67 | 20 6c 69 6e 65 73 20 74 |ake long| lines t|
|00004540| 6f 6f 20 6c 6f 6e 67 20 | 74 6f 20 66 69 74 20 6f |oo long |to fit o|
|00004550| 6e 20 6f 6e 65 20 6c 69 | 6e 65 0a 6f 66 20 74 68 |n one li|ne.of th|
|00004560| 65 20 73 63 72 65 65 6e | 20 6f 72 20 74 68 65 20 |e screen| or the |
|00004570| 70 61 70 65 72 2e 20 20 | 49 74 20 61 6c 73 6f 20 |paper. |It also |
|00004580| 64 6f 65 73 20 6e 6f 74 | 20 77 6f 72 6b 20 77 69 |does not| work wi|
|00004590| 74 68 20 74 68 65 20 75 | 6e 69 66 69 65 64 0a 6f |th the u|nified.o|
|000045a0| 75 74 70 75 74 20 66 6f | 72 6d 61 74 2c 20 77 68 |utput fo|rmat, wh|
|000045b0| 69 63 68 20 64 6f 65 73 | 20 6e 6f 74 20 68 61 76 |ich does| not hav|
|000045c0| 65 20 61 20 73 70 61 63 | 65 20 63 68 61 72 61 63 |e a spac|e charac|
|000045d0| 74 65 72 20 61 66 74 65 | 72 20 74 68 65 20 63 68 |ter afte|r the ch|
|000045e0| 61 6e 67 65 0a 74 79 70 | 65 20 69 6e 64 69 63 61 |ange.typ|e indica|
|000045f0| 74 6f 72 20 63 68 61 72 | 61 63 74 65 72 2e 20 20 |tor char|acter. |
|00004600| 53 65 6c 65 63 74 20 74 | 68 69 73 20 6d 65 74 68 |Select t|his meth|
|00004610| 6f 64 20 77 69 74 68 20 | 74 68 65 20 60 2d 54 27 |od with |the `-T'|
|00004620| 20 6f 72 0a 60 2d 2d 69 | 6e 69 74 69 61 6c 2d 74 | or.`--i|nitial-t|
|00004630| 61 62 27 20 6f 70 74 69 | 6f 6e 2e 0a 0a 1f 0a 46 |ab' opti|on.....F|
|00004640| 69 6c 65 3a 20 64 69 66 | 66 2e 69 6e 66 6f 2c 20 |ile: dif|f.info, |
|00004650| 20 4e 6f 64 65 3a 20 50 | 61 67 69 6e 61 74 69 6f | Node: P|aginatio|
|00004660| 6e 2c 20 20 50 72 65 76 | 3a 20 54 61 62 73 2c 20 |n, Prev|: Tabs, |
|00004670| 20 55 70 3a 20 41 64 6a | 75 73 74 69 6e 67 20 4f | Up: Adj|usting O|
|00004680| 75 74 70 75 74 0a 0a 50 | 61 67 69 6e 61 74 69 6e |utput..P|aginatin|
|00004690| 67 20 60 64 69 66 66 27 | 20 4f 75 74 70 75 74 0a |g `diff'| Output.|
|000046a0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000046b0| 3d 3d 3d 3d 3d 3d 3d 3d | 0a 0a 20 20 20 49 74 20 |========|.. It |
|000046c0| 63 61 6e 20 62 65 20 63 | 6f 6e 76 65 6e 69 65 6e |can be c|onvenien|
|000046d0| 74 20 74 6f 20 68 61 76 | 65 20 6c 6f 6e 67 20 6f |t to hav|e long o|
|000046e0| 75 74 70 75 74 20 70 61 | 67 65 2d 6e 75 6d 62 65 |utput pa|ge-numbe|
|000046f0| 72 65 64 20 61 6e 64 0a | 74 69 6d 65 2d 73 74 61 |red and.|time-sta|
|00004700| 6d 70 65 64 2e 20 20 54 | 68 65 20 60 2d 6c 27 20 |mped. T|he `-l' |
|00004710| 61 6e 64 20 60 2d 2d 70 | 61 67 69 6e 61 74 65 27 |and `--p|aginate'|
|00004720| 20 6f 70 74 69 6f 6e 73 | 20 64 6f 20 74 68 69 73 | options| do this|
|00004730| 20 62 79 20 73 65 6e 64 | 69 6e 67 20 74 68 65 0a | by send|ing the.|
|00004740| 60 64 69 66 66 27 20 6f | 75 74 70 75 74 20 74 68 |`diff' o|utput th|
|00004750| 72 6f 75 67 68 20 74 68 | 65 20 60 70 72 27 20 70 |rough th|e `pr' p|
|00004760| 72 6f 67 72 61 6d 2e 20 | 20 48 65 72 65 20 69 73 |rogram. | Here is|
|00004770| 20 77 68 61 74 20 74 68 | 65 20 70 61 67 65 20 68 | what th|e page h|
|00004780| 65 61 64 65 72 0a 6d 69 | 67 68 74 20 6c 6f 6f 6b |eader.mi|ght look|
|00004790| 20 6c 69 6b 65 20 66 6f | 72 20 60 64 69 66 66 20 | like fo|r `diff |
|000047a0| 2d 6c 63 20 6c 61 6f 20 | 74 7a 75 27 3a 0a 0a 20 |-lc lao |tzu':.. |
|000047b0| 20 20 20 20 4d 61 72 20 | 31 31 20 31 33 3a 33 37 | Mar |11 13:37|
|000047c0| 20 31 39 39 31 20 20 64 | 69 66 66 20 2d 6c 63 20 | 1991 d|iff -lc |
|000047d0| 6c 61 6f 20 74 7a 75 20 | 50 61 67 65 20 31 0a 0a |lao tzu |Page 1..|
|000047e0| 1f 0a 46 69 6c 65 3a 20 | 64 69 66 66 2e 69 6e 66 |..File: |diff.inf|
|000047f0| 6f 2c 20 20 4e 6f 64 65 | 3a 20 64 69 66 66 20 50 |o, Node|: diff P|
|00004800| 65 72 66 6f 72 6d 61 6e | 63 65 2c 20 20 4e 65 78 |erforman|ce, Nex|
|00004810| 74 3a 20 43 6f 6d 70 61 | 72 69 6e 67 20 54 68 72 |t: Compa|ring Thr|
|00004820| 65 65 20 46 69 6c 65 73 | 2c 20 20 50 72 65 76 3a |ee Files|, Prev:|
|00004830| 20 41 64 6a 75 73 74 69 | 6e 67 20 4f 75 74 70 75 | Adjusti|ng Outpu|
|00004840| 74 2c 20 20 55 70 3a 20 | 54 6f 70 0a 0a 60 64 69 |t, Up: |Top..`di|
|00004850| 66 66 27 20 50 65 72 66 | 6f 72 6d 61 6e 63 65 20 |ff' Perf|ormance |
|00004860| 54 72 61 64 65 6f 66 66 | 73 0a 2a 2a 2a 2a 2a 2a |Tradeoff|s.******|
|00004870| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00004880| 2a 2a 2a 2a 2a 2a 0a 0a | 20 20 20 47 4e 55 20 60 |******..| GNU `|
|00004890| 64 69 66 66 27 20 72 75 | 6e 73 20 71 75 69 74 65 |diff' ru|ns quite|
|000048a0| 20 65 66 66 69 63 69 65 | 6e 74 6c 79 3b 20 68 6f | efficie|ntly; ho|
|000048b0| 77 65 76 65 72 2c 20 69 | 6e 20 73 6f 6d 65 20 63 |wever, i|n some c|
|000048c0| 69 72 63 75 6d 73 74 61 | 6e 63 65 73 0a 79 6f 75 |ircumsta|nces.you|
|000048d0| 20 63 61 6e 20 63 61 75 | 73 65 20 69 74 20 74 6f | can cau|se it to|
|000048e0| 20 72 75 6e 20 66 61 73 | 74 65 72 20 6f 72 20 70 | run fas|ter or p|
|000048f0| 72 6f 64 75 63 65 20 61 | 20 6d 6f 72 65 20 63 6f |roduce a| more co|
|00004900| 6d 70 61 63 74 20 73 65 | 74 20 6f 66 20 63 68 61 |mpact se|t of cha|
|00004910| 6e 67 65 73 2e 0a 54 68 | 65 72 65 20 61 72 65 20 |nges..Th|ere are |
|00004920| 74 77 6f 20 77 61 79 73 | 20 74 68 61 74 20 79 6f |two ways| that yo|
|00004930| 75 20 63 61 6e 20 61 66 | 66 65 63 74 20 74 68 65 |u can af|fect the|
|00004940| 20 70 65 72 66 6f 72 6d | 61 6e 63 65 20 6f 66 20 | perform|ance of |
|00004950| 47 4e 55 20 60 64 69 66 | 66 27 20 62 79 0a 63 68 |GNU `dif|f' by.ch|
|00004960| 61 6e 67 69 6e 67 20 74 | 68 65 20 77 61 79 20 69 |anging t|he way i|
|00004970| 74 20 63 6f 6d 70 61 72 | 65 73 20 66 69 6c 65 73 |t compar|es files|
|00004980| 2e 0a 0a 20 20 20 50 65 | 72 66 6f 72 6d 61 6e 63 |... Pe|rformanc|
|00004990| 65 20 68 61 73 20 6d 6f | 72 65 20 74 68 61 6e 20 |e has mo|re than |
|000049a0| 6f 6e 65 20 64 69 6d 65 | 6e 73 69 6f 6e 2e 20 20 |one dime|nsion. |
|000049b0| 54 68 65 73 65 20 6f 70 | 74 69 6f 6e 73 20 69 6d |These op|tions im|
|000049c0| 70 72 6f 76 65 20 6f 6e | 65 0a 61 73 70 65 63 74 |prove on|e.aspect|
|000049d0| 20 6f 66 20 70 65 72 66 | 6f 72 6d 61 6e 63 65 20 | of perf|ormance |
|000049e0| 61 74 20 74 68 65 20 63 | 6f 73 74 20 6f 66 20 61 |at the c|ost of a|
|000049f0| 6e 6f 74 68 65 72 2c 20 | 6f 72 20 74 68 65 79 20 |nother, |or they |
|00004a00| 69 6d 70 72 6f 76 65 0a | 70 65 72 66 6f 72 6d 61 |improve.|performa|
|00004a10| 6e 63 65 20 69 6e 20 73 | 6f 6d 65 20 63 61 73 65 |nce in s|ome case|
|00004a20| 73 20 77 68 69 6c 65 20 | 68 75 72 74 69 6e 67 20 |s while |hurting |
|00004a30| 69 74 20 69 6e 20 6f 74 | 68 65 72 73 2e 0a 0a 20 |it in ot|hers... |
|00004a40| 20 20 54 68 65 20 77 61 | 79 20 74 68 61 74 20 47 | The wa|y that G|
|00004a50| 4e 55 20 60 64 69 66 66 | 27 20 64 65 74 65 72 6d |NU `diff|' determ|
|00004a60| 69 6e 65 73 20 77 68 69 | 63 68 20 6c 69 6e 65 73 |ines whi|ch lines|
|00004a70| 20 68 61 76 65 20 63 68 | 61 6e 67 65 64 20 61 6c | have ch|anged al|
|00004a80| 77 61 79 73 0a 63 6f 6d | 65 73 20 75 70 20 77 69 |ways.com|es up wi|
|00004a90| 74 68 20 61 20 6e 65 61 | 72 2d 6d 69 6e 69 6d 61 |th a nea|r-minima|
|00004aa0| 6c 20 73 65 74 20 6f 66 | 20 64 69 66 66 65 72 65 |l set of| differe|
|00004ab0| 6e 63 65 73 2e 20 20 55 | 73 75 61 6c 6c 79 20 69 |nces. U|sually i|
|00004ac0| 74 20 69 73 20 67 6f 6f | 64 0a 65 6e 6f 75 67 68 |t is goo|d.enough|
|00004ad0| 20 66 6f 72 20 70 72 61 | 63 74 69 63 61 6c 20 70 | for pra|ctical p|
|00004ae0| 75 72 70 6f 73 65 73 2e | 20 20 49 66 20 74 68 65 |urposes.| If the|
|00004af0| 20 60 64 69 66 66 27 20 | 6f 75 74 70 75 74 20 69 | `diff' |output i|
|00004b00| 73 20 6c 61 72 67 65 2c | 20 79 6f 75 0a 6d 69 67 |s large,| you.mig|
|00004b10| 68 74 20 77 61 6e 74 20 | 60 64 69 66 66 27 20 74 |ht want |`diff' t|
|00004b20| 6f 20 75 73 65 20 61 20 | 6d 6f 64 69 66 69 65 64 |o use a |modified|
|00004b30| 20 61 6c 67 6f 72 69 74 | 68 6d 20 74 68 61 74 20 | algorit|hm that |
|00004b40| 73 6f 6d 65 74 69 6d 65 | 73 20 70 72 6f 64 75 63 |sometime|s produc|
|00004b50| 65 73 20 61 0a 73 6d 61 | 6c 6c 65 72 20 73 65 74 |es a.sma|ller set|
|00004b60| 20 6f 66 20 64 69 66 66 | 65 72 65 6e 63 65 73 2e | of diff|erences.|
|00004b70| 20 20 54 68 65 20 60 2d | 64 27 20 6f 72 20 60 2d | The `-|d' or `-|
|00004b80| 2d 6d 69 6e 69 6d 61 6c | 27 20 6f 70 74 69 6f 6e |-minimal|' option|
|00004b90| 20 64 6f 65 73 20 74 68 | 69 73 3b 0a 68 6f 77 65 | does th|is;.howe|
|00004ba0| 76 65 72 2c 20 69 74 20 | 63 61 6e 20 61 6c 73 6f |ver, it |can also|
|00004bb0| 20 63 61 75 73 65 20 60 | 64 69 66 66 27 20 74 6f | cause `|diff' to|
|00004bc0| 20 72 75 6e 20 6d 6f 72 | 65 20 73 6c 6f 77 6c 79 | run mor|e slowly|
|00004bd0| 20 74 68 61 6e 20 75 73 | 75 61 6c 2c 20 73 6f 20 | than us|ual, so |
|00004be0| 69 74 0a 69 73 20 6e 6f | 74 20 74 68 65 20 64 65 |it.is no|t the de|
|00004bf0| 66 61 75 6c 74 20 62 65 | 68 61 76 69 6f 72 2e 0a |fault be|havior..|
|00004c00| 0a 20 20 20 57 68 65 6e | 20 74 68 65 20 66 69 6c |. When| the fil|
|00004c10| 65 73 20 79 6f 75 20 61 | 72 65 20 63 6f 6d 70 61 |es you a|re compa|
|00004c20| 72 69 6e 67 20 61 72 65 | 20 6c 61 72 67 65 20 61 |ring are| large a|
|00004c30| 6e 64 20 68 61 76 65 20 | 73 6d 61 6c 6c 20 67 72 |nd have |small gr|
|00004c40| 6f 75 70 73 20 6f 66 0a | 63 68 61 6e 67 65 73 20 |oups of.|changes |
|00004c50| 73 63 61 74 74 65 72 65 | 64 20 74 68 72 6f 75 67 |scattere|d throug|
|00004c60| 68 6f 75 74 20 74 68 65 | 6d 2c 20 79 6f 75 20 63 |hout the|m, you c|
|00004c70| 61 6e 20 75 73 65 20 74 | 68 65 20 60 2d 48 27 20 |an use t|he `-H' |
|00004c80| 6f 72 0a 60 2d 2d 73 70 | 65 65 64 2d 6c 61 72 67 |or.`--sp|eed-larg|
|00004c90| 65 2d 66 69 6c 65 73 27 | 20 6f 70 74 69 6f 6e 20 |e-files'| option |
|00004ca0| 74 6f 20 6d 61 6b 65 20 | 61 20 64 69 66 66 65 72 |to make |a differ|
|00004cb0| 65 6e 74 20 6d 6f 64 69 | 66 69 63 61 74 69 6f 6e |ent modi|fication|
|00004cc0| 20 74 6f 20 74 68 65 0a | 61 6c 67 6f 72 69 74 68 | to the.|algorith|
|00004cd0| 6d 20 74 68 61 74 20 60 | 64 69 66 66 27 20 75 73 |m that `|diff' us|
|00004ce0| 65 73 2e 20 20 49 66 20 | 74 68 65 20 69 6e 70 75 |es. If |the inpu|
|00004cf0| 74 20 66 69 6c 65 73 20 | 68 61 76 65 20 61 20 63 |t files |have a c|
|00004d00| 6f 6e 73 74 61 6e 74 20 | 73 6d 61 6c 6c 0a 64 65 |onstant |small.de|
|00004d10| 6e 73 69 74 79 20 6f 66 | 20 63 68 61 6e 67 65 73 |nsity of| changes|
|00004d20| 2c 20 74 68 69 73 20 6f | 70 74 69 6f 6e 20 73 70 |, this o|ption sp|
|00004d30| 65 65 64 73 20 75 70 20 | 74 68 65 20 63 6f 6d 70 |eeds up |the comp|
|00004d40| 61 72 69 73 6f 6e 73 20 | 77 69 74 68 6f 75 74 0a |arisons |without.|
|00004d50| 63 68 61 6e 67 69 6e 67 | 20 74 68 65 20 6f 75 74 |changing| the out|
|00004d60| 70 75 74 2e 20 20 49 66 | 20 6e 6f 74 2c 20 60 64 |put. If| not, `d|
|00004d70| 69 66 66 27 20 6d 69 67 | 68 74 20 70 72 6f 64 75 |iff' mig|ht produ|
|00004d80| 63 65 20 61 20 6c 61 72 | 67 65 72 20 73 65 74 20 |ce a lar|ger set |
|00004d90| 6f 66 0a 64 69 66 66 65 | 72 65 6e 63 65 73 3b 20 |of.diffe|rences; |
|00004da0| 68 6f 77 65 76 65 72 2c | 20 74 68 65 20 6f 75 74 |however,| the out|
|00004db0| 70 75 74 20 77 69 6c 6c | 20 73 74 69 6c 6c 20 62 |put will| still b|
|00004dc0| 65 20 63 6f 72 72 65 63 | 74 2e 0a 0a 20 20 20 4e |e correc|t... N|
|00004dd0| 6f 72 6d 61 6c 6c 79 20 | 60 64 69 66 66 27 20 64 |ormally |`diff' d|
|00004de0| 69 73 63 61 72 64 73 20 | 74 68 65 20 70 72 65 66 |iscards |the pref|
|00004df0| 69 78 20 61 6e 64 20 73 | 75 66 66 69 78 20 74 68 |ix and s|uffix th|
|00004e00| 61 74 20 69 73 20 63 6f | 6d 6d 6f 6e 20 74 6f 0a |at is co|mmon to.|
|00004e10| 62 6f 74 68 20 66 69 6c | 65 73 20 62 65 66 6f 72 |both fil|es befor|
|00004e20| 65 20 69 74 20 61 74 74 | 65 6d 70 74 73 20 74 6f |e it att|empts to|
|00004e30| 20 66 69 6e 64 20 61 20 | 6d 69 6e 69 6d 61 6c 20 | find a |minimal |
|00004e40| 73 65 74 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |set of d|ifferenc|
|00004e50| 65 73 2e 0a 54 68 69 73 | 20 6d 61 6b 65 73 20 60 |es..This| makes `|
|00004e60| 64 69 66 66 27 20 72 75 | 6e 20 66 61 73 74 65 72 |diff' ru|n faster|
|00004e70| 2c 20 62 75 74 20 6f 63 | 63 61 73 69 6f 6e 61 6c |, but oc|casional|
|00004e80| 6c 79 20 69 74 20 6d 61 | 79 20 70 72 6f 64 75 63 |ly it ma|y produc|
|00004e90| 65 0a 6e 6f 6e 2d 6d 69 | 6e 69 6d 61 6c 20 6f 75 |e.non-mi|nimal ou|
|00004ea0| 74 70 75 74 2e 20 20 54 | 68 65 20 60 2d 2d 68 6f |tput. T|he `--ho|
|00004eb0| 72 69 7a 6f 6e 2d 6c 69 | 6e 65 73 3d 4c 49 4e 45 |rizon-li|nes=LINE|
|00004ec0| 53 27 20 6f 70 74 69 6f | 6e 20 70 72 65 76 65 6e |S' optio|n preven|
|00004ed0| 74 73 20 60 64 69 66 66 | 27 0a 66 72 6f 6d 20 64 |ts `diff|'.from d|
|00004ee0| 69 73 63 61 72 64 69 6e | 67 20 74 68 65 20 6c 61 |iscardin|g the la|
|00004ef0| 73 74 20 4c 49 4e 45 53 | 20 6c 69 6e 65 73 20 6f |st LINES| lines o|
|00004f00| 66 20 74 68 65 20 70 72 | 65 66 69 78 20 61 6e 64 |f the pr|efix and|
|00004f10| 20 74 68 65 20 66 69 72 | 73 74 20 4c 49 4e 45 53 | the fir|st LINES|
|00004f20| 0a 6c 69 6e 65 73 20 6f | 66 20 74 68 65 20 73 75 |.lines o|f the su|
|00004f30| 66 66 69 78 2e 20 20 54 | 68 69 73 20 67 69 76 65 |ffix. T|his give|
|00004f40| 73 20 60 64 69 66 66 27 | 20 66 75 72 74 68 65 72 |s `diff'| further|
|00004f50| 20 6f 70 70 6f 72 74 75 | 6e 69 74 69 65 73 20 74 | opportu|nities t|
|00004f60| 6f 20 66 69 6e 64 20 61 | 0a 6d 69 6e 69 6d 61 6c |o find a|.minimal|
|00004f70| 20 6f 75 74 70 75 74 2e | 0a 0a 1f 0a 46 69 6c 65 | output.|....File|
|00004f80| 3a 20 64 69 66 66 2e 69 | 6e 66 6f 2c 20 20 4e 6f |: diff.i|nfo, No|
|00004f90| 64 65 3a 20 43 6f 6d 70 | 61 72 69 6e 67 20 54 68 |de: Comp|aring Th|
|00004fa0| 72 65 65 20 46 69 6c 65 | 73 2c 20 20 4e 65 78 74 |ree File|s, Next|
|00004fb0| 3a 20 64 69 66 66 33 20 | 4d 65 72 67 69 6e 67 2c |: diff3 |Merging,|
|00004fc0| 20 20 50 72 65 76 3a 20 | 64 69 66 66 20 50 65 72 | Prev: |diff Per|
|00004fd0| 66 6f 72 6d 61 6e 63 65 | 2c 20 20 55 70 3a 20 54 |formance|, Up: T|
|00004fe0| 6f 70 0a 0a 43 6f 6d 70 | 61 72 69 6e 67 20 54 68 |op..Comp|aring Th|
|00004ff0| 72 65 65 20 46 69 6c 65 | 73 0a 2a 2a 2a 2a 2a 2a |ree File|s.******|
|00005000| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 0a |********|*******.|
|00005010| 0a 20 20 20 55 73 65 20 | 74 68 65 20 70 72 6f 67 |. Use |the prog|
|00005020| 72 61 6d 20 60 64 69 66 | 66 33 27 20 74 6f 20 63 |ram `dif|f3' to c|
|00005030| 6f 6d 70 61 72 65 20 74 | 68 72 65 65 20 66 69 6c |ompare t|hree fil|
|00005040| 65 73 20 61 6e 64 20 73 | 68 6f 77 20 61 6e 79 0a |es and s|how any.|
|00005050| 64 69 66 66 65 72 65 6e | 63 65 73 20 61 6d 6f 6e |differen|ces amon|
|00005060| 67 20 74 68 65 6d 2e 20 | 20 28 60 64 69 66 66 33 |g them. | (`diff3|
|00005070| 27 20 63 61 6e 20 61 6c | 73 6f 20 6d 65 72 67 65 |' can al|so merge|
|00005080| 20 66 69 6c 65 73 3b 20 | 73 65 65 20 2a 4e 6f 74 | files; |see *Not|
|00005090| 65 20 64 69 66 66 33 0a | 4d 65 72 67 69 6e 67 3a |e diff3.|Merging:|
|000050a0| 3a 2e 29 2e 0a 0a 20 20 | 20 54 68 65 20 22 6e 6f |:.)... | The "no|
|000050b0| 72 6d 61 6c 22 20 60 64 | 69 66 66 33 27 20 6f 75 |rmal" `d|iff3' ou|
|000050c0| 74 70 75 74 20 66 6f 72 | 6d 61 74 20 73 68 6f 77 |tput for|mat show|
|000050d0| 73 20 65 61 63 68 20 68 | 75 6e 6b 20 6f 66 20 64 |s each h|unk of d|
|000050e0| 69 66 66 65 72 65 6e 63 | 65 73 0a 77 69 74 68 6f |ifferenc|es.witho|
|000050f0| 75 74 20 73 75 72 72 6f | 75 6e 64 69 6e 67 20 63 |ut surro|unding c|
|00005100| 6f 6e 74 65 78 74 2e 20 | 20 48 75 6e 6b 73 20 61 |ontext. | Hunks a|
|00005110| 72 65 20 6c 61 62 65 6c | 65 64 20 64 65 70 65 6e |re label|ed depen|
|00005120| 64 69 6e 67 20 6f 6e 20 | 77 68 65 74 68 65 72 0a |ding on |whether.|
|00005130| 74 68 65 79 20 61 72 65 | 20 74 77 6f 2d 77 61 79 |they are| two-way|
|00005140| 20 6f 72 20 74 68 72 65 | 65 2d 77 61 79 2c 20 61 | or thre|e-way, a|
|00005150| 6e 64 20 6c 69 6e 65 73 | 20 61 72 65 20 61 6e 6e |nd lines| are ann|
|00005160| 6f 74 61 74 65 64 20 62 | 79 20 74 68 65 69 72 0a |otated b|y their.|
|00005170| 6c 6f 63 61 74 69 6f 6e | 20 69 6e 20 74 68 65 20 |location| in the |
|00005180| 69 6e 70 75 74 20 66 69 | 6c 65 73 2e 0a 0a 20 20 |input fi|les... |
|00005190| 20 2a 4e 6f 74 65 20 49 | 6e 76 6f 6b 69 6e 67 20 | *Note I|nvoking |
|000051a0| 64 69 66 66 33 3a 3a 2c | 20 66 6f 72 20 6d 6f 72 |diff3::,| for mor|
|000051b0| 65 20 69 6e 66 6f 72 6d | 61 74 69 6f 6e 20 6f 6e |e inform|ation on|
|000051c0| 20 68 6f 77 20 74 6f 20 | 72 75 6e 20 60 64 69 66 | how to |run `dif|
|000051d0| 66 33 27 2e 0a 0a 2a 20 | 4d 65 6e 75 3a 0a 0a 2a |f3'...* |Menu:..*|
|000051e0| 20 53 61 6d 70 6c 65 20 | 64 69 66 66 33 20 49 6e | Sample |diff3 In|
|000051f0| 70 75 74 3a 3a 09 09 53 | 61 6d 70 6c 65 20 60 64 |put::..S|ample `d|
|00005200| 69 66 66 33 27 20 69 6e | 70 75 74 20 66 6f 72 20 |iff3' in|put for |
|00005210| 65 78 61 6d 70 6c 65 73 | 2e 0a 2a 20 44 65 74 61 |examples|..* Deta|
|00005220| 69 6c 65 64 20 64 69 66 | 66 33 20 4e 6f 72 6d 61 |iled dif|f3 Norma|
|00005230| 6c 3a 3a 09 41 20 64 65 | 74 61 69 6c 65 64 20 64 |l::.A de|tailed d|
|00005240| 65 73 63 72 69 70 74 69 | 6f 6e 20 6f 66 20 6e 6f |escripti|on of no|
|00005250| 72 6d 61 6c 20 6f 75 74 | 70 75 74 20 66 6f 72 6d |rmal out|put form|
|00005260| 61 74 2e 0a 2a 20 64 69 | 66 66 33 20 48 75 6e 6b |at..* di|ff3 Hunk|
|00005270| 73 3a 3a 09 09 09 54 68 | 65 20 66 6f 72 6d 61 74 |s::...Th|e format|
|00005280| 20 6f 66 20 6e 6f 72 6d | 61 6c 20 6f 75 74 70 75 | of norm|al outpu|
|00005290| 74 20 66 6f 72 6d 61 74 | 2e 0a 2a 20 45 78 61 6d |t format|..* Exam|
|000052a0| 70 6c 65 20 64 69 66 66 | 33 20 4e 6f 72 6d 61 6c |ple diff|3 Normal|
|000052b0| 3a 3a 09 53 61 6d 70 6c | 65 20 6f 75 74 70 75 74 |::.Sampl|e output|
|000052c0| 20 69 6e 20 74 68 65 20 | 6e 6f 72 6d 61 6c 20 66 | in the |normal f|
|000052d0| 6f 72 6d 61 74 2e 0a 0a | 1f 0a 46 69 6c 65 3a 20 |ormat...|..File: |
|000052e0| 64 69 66 66 2e 69 6e 66 | 6f 2c 20 20 4e 6f 64 65 |diff.inf|o, Node|
|000052f0| 3a 20 53 61 6d 70 6c 65 | 20 64 69 66 66 33 20 49 |: Sample| diff3 I|
|00005300| 6e 70 75 74 2c 20 20 4e | 65 78 74 3a 20 44 65 74 |nput, N|ext: Det|
|00005310| 61 69 6c 65 64 20 64 69 | 66 66 33 20 4e 6f 72 6d |ailed di|ff3 Norm|
|00005320| 61 6c 2c 20 20 55 70 3a | 20 43 6f 6d 70 61 72 69 |al, Up:| Compari|
|00005330| 6e 67 20 54 68 72 65 65 | 20 46 69 6c 65 73 0a 0a |ng Three| Files..|
|00005340| 41 20 54 68 69 72 64 20 | 53 61 6d 70 6c 65 20 49 |A Third |Sample I|
|00005350| 6e 70 75 74 20 46 69 6c | 65 0a 3d 3d 3d 3d 3d 3d |nput Fil|e.======|
|00005360| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005370| 3d 3d 3d 0a 0a 20 20 20 | 48 65 72 65 20 69 73 20 |===.. |Here is |
|00005380| 61 20 74 68 69 72 64 20 | 73 61 6d 70 6c 65 20 66 |a third |sample f|
|00005390| 69 6c 65 20 74 68 61 74 | 20 77 69 6c 6c 20 62 65 |ile that| will be|
|000053a0| 20 75 73 65 64 20 69 6e | 20 65 78 61 6d 70 6c 65 | used in| example|
|000053b0| 73 20 74 6f 0a 69 6c 6c | 75 73 74 72 61 74 65 20 |s to.ill|ustrate |
|000053c0| 74 68 65 20 6f 75 74 70 | 75 74 20 6f 66 20 60 64 |the outp|ut of `d|
|000053d0| 69 66 66 33 27 20 61 6e | 64 20 68 6f 77 20 76 61 |iff3' an|d how va|
|000053e0| 72 69 6f 75 73 20 6f 70 | 74 69 6f 6e 73 20 63 61 |rious op|tions ca|
|000053f0| 6e 20 63 68 61 6e 67 65 | 20 69 74 2e 0a 54 68 65 |n change| it..The|
|00005400| 20 66 69 72 73 74 20 74 | 77 6f 20 66 69 6c 65 73 | first t|wo files|
|00005410| 20 61 72 65 20 74 68 65 | 20 73 61 6d 65 20 74 68 | are the| same th|
|00005420| 61 74 20 77 65 20 75 73 | 65 64 20 66 6f 72 20 60 |at we us|ed for `|
|00005430| 64 69 66 66 27 20 28 2a | 6e 6f 74 65 20 53 61 6d |diff' (*|note Sam|
|00005440| 70 6c 65 0a 64 69 66 66 | 20 49 6e 70 75 74 3a 3a |ple.diff| Input::|
|00005450| 2e 29 2e 20 20 54 68 69 | 73 20 69 73 20 74 68 65 |.). Thi|s is the|
|00005460| 20 74 68 69 72 64 20 73 | 61 6d 70 6c 65 20 66 69 | third s|ample fi|
|00005470| 6c 65 2c 20 63 61 6c 6c | 65 64 20 60 74 61 6f 27 |le, call|ed `tao'|
|00005480| 3a 0a 0a 20 20 20 20 20 | 54 68 65 20 57 61 79 20 |:.. |The Way |
|00005490| 74 68 61 74 20 63 61 6e | 20 62 65 20 74 6f 6c 64 |that can| be told|
|000054a0| 20 6f 66 20 69 73 20 6e | 6f 74 20 74 68 65 20 65 | of is n|ot the e|
|000054b0| 74 65 72 6e 61 6c 20 57 | 61 79 3b 0a 20 20 20 20 |ternal W|ay;. |
|000054c0| 20 54 68 65 20 6e 61 6d | 65 20 74 68 61 74 20 63 | The nam|e that c|
|000054d0| 61 6e 20 62 65 20 6e 61 | 6d 65 64 20 69 73 20 6e |an be na|med is n|
|000054e0| 6f 74 20 74 68 65 20 65 | 74 65 72 6e 61 6c 20 6e |ot the e|ternal n|
|000054f0| 61 6d 65 2e 0a 20 20 20 | 20 20 54 68 65 20 4e 61 |ame.. | The Na|
|00005500| 6d 65 6c 65 73 73 20 69 | 73 20 74 68 65 20 6f 72 |meless i|s the or|
|00005510| 69 67 69 6e 20 6f 66 20 | 48 65 61 76 65 6e 20 61 |igin of |Heaven a|
|00005520| 6e 64 20 45 61 72 74 68 | 3b 0a 20 20 20 20 20 54 |nd Earth|;. T|
|00005530| 68 65 20 6e 61 6d 65 64 | 20 69 73 20 74 68 65 20 |he named| is the |
|00005540| 6d 6f 74 68 65 72 20 6f | 66 20 61 6c 6c 20 74 68 |mother o|f all th|
|00005550| 69 6e 67 73 2e 0a 20 20 | 20 20 20 0a 20 20 20 20 |ings.. | . |
|00005560| 20 54 68 65 72 65 66 6f | 72 65 20 6c 65 74 20 74 | Therefo|re let t|
|00005570| 68 65 72 65 20 61 6c 77 | 61 79 73 20 62 65 20 6e |here alw|ays be n|
|00005580| 6f 6e 2d 62 65 69 6e 67 | 2c 0a 20 20 20 20 20 20 |on-being|,. |
|00005590| 20 73 6f 20 77 65 20 6d | 61 79 20 73 65 65 20 74 | so we m|ay see t|
|000055a0| 68 65 69 72 20 73 75 62 | 74 6c 65 74 79 2c 0a 20 |heir sub|tlety,. |
|000055b0| 20 20 20 20 41 6e 64 20 | 6c 65 74 20 74 68 65 72 | And |let ther|
|000055c0| 65 20 61 6c 77 61 79 73 | 20 62 65 20 62 65 69 6e |e always| be bein|
|000055d0| 67 2c 0a 20 20 20 20 20 | 20 20 73 6f 20 77 65 20 |g,. | so we |
|000055e0| 6d 61 79 20 73 65 65 20 | 74 68 65 69 72 20 72 65 |may see |their re|
|000055f0| 73 75 6c 74 2e 0a 20 20 | 20 20 20 54 68 65 20 74 |sult.. | The t|
|00005600| 77 6f 20 61 72 65 20 74 | 68 65 20 73 61 6d 65 2c |wo are t|he same,|
|00005610| 0a 20 20 20 20 20 42 75 | 74 20 61 66 74 65 72 20 |. Bu|t after |
|00005620| 74 68 65 79 20 61 72 65 | 20 70 72 6f 64 75 63 65 |they are| produce|
|00005630| 64 2c 0a 20 20 20 20 20 | 20 20 74 68 65 79 20 68 |d,. | they h|
|00005640| 61 76 65 20 64 69 66 66 | 65 72 65 6e 74 20 6e 61 |ave diff|erent na|
|00005650| 6d 65 73 2e 0a 20 20 20 | 20 20 0a 20 20 20 20 20 |mes.. | . |
|00005660| 20 20 2d 2d 20 54 68 65 | 20 57 61 79 20 6f 66 20 | -- The| Way of |
|00005670| 4c 61 6f 2d 54 7a 75 2c | 20 74 72 2e 20 57 69 6e |Lao-Tzu,| tr. Win|
|00005680| 67 2d 74 73 69 74 20 43 | 68 61 6e 0a 0a 1f 0a 46 |g-tsit C|han....F|
|00005690| 69 6c 65 3a 20 64 69 66 | 66 2e 69 6e 66 6f 2c 20 |ile: dif|f.info, |
|000056a0| 20 4e 6f 64 65 3a 20 44 | 65 74 61 69 6c 65 64 20 | Node: D|etailed |
|000056b0| 64 69 66 66 33 20 4e 6f | 72 6d 61 6c 2c 20 20 4e |diff3 No|rmal, N|
|000056c0| 65 78 74 3a 20 64 69 66 | 66 33 20 48 75 6e 6b 73 |ext: dif|f3 Hunks|
|000056d0| 2c 20 20 50 72 65 76 3a | 20 53 61 6d 70 6c 65 20 |, Prev:| Sample |
|000056e0| 64 69 66 66 33 20 49 6e | 70 75 74 2c 20 20 55 70 |diff3 In|put, Up|
|000056f0| 3a 20 43 6f 6d 70 61 72 | 69 6e 67 20 54 68 72 65 |: Compar|ing Thre|
|00005700| 65 20 46 69 6c 65 73 0a | 0a 44 65 74 61 69 6c 65 |e Files.|.Detaile|
|00005710| 64 20 44 65 73 63 72 69 | 70 74 69 6f 6e 20 6f 66 |d Descri|ption of|
|00005720| 20 60 64 69 66 66 33 27 | 20 4e 6f 72 6d 61 6c 20 | `diff3'| Normal |
|00005730| 46 6f 72 6d 61 74 0a 3d | 3d 3d 3d 3d 3d 3d 3d 3d |Format.=|========|
|00005740| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005750| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005760| 3d 3d 3d 3d 0a 0a 20 20 | 20 45 61 63 68 20 68 75 |====.. | Each hu|
|00005770| 6e 6b 20 62 65 67 69 6e | 73 20 77 69 74 68 20 61 |nk begin|s with a|
|00005780| 20 6c 69 6e 65 20 6d 61 | 72 6b 65 64 20 60 3d 3d | line ma|rked `==|
|00005790| 3d 3d 27 2e 20 20 54 68 | 72 65 65 2d 77 61 79 20 |=='. Th|ree-way |
|000057a0| 68 75 6e 6b 73 20 68 61 | 76 65 0a 70 6c 61 69 6e |hunks ha|ve.plain|
|000057b0| 20 60 3d 3d 3d 3d 27 20 | 6c 69 6e 65 73 2c 20 61 | `====' |lines, a|
|000057c0| 6e 64 20 74 77 6f 2d 77 | 61 79 20 68 75 6e 6b 73 |nd two-w|ay hunks|
|000057d0| 20 68 61 76 65 20 60 31 | 27 2c 20 60 32 27 2c 20 | have `1|', `2', |
|000057e0| 6f 72 20 60 33 27 20 61 | 70 70 65 6e 64 65 64 20 |or `3' a|ppended |
|000057f0| 74 6f 0a 73 70 65 63 69 | 66 79 20 77 68 69 63 68 |to.speci|fy which|
|00005800| 20 6f 66 20 74 68 65 20 | 74 68 72 65 65 20 69 6e | of the |three in|
|00005810| 70 75 74 20 66 69 6c 65 | 73 20 64 69 66 66 65 72 |put file|s differ|
|00005820| 20 69 6e 20 74 68 61 74 | 20 68 75 6e 6b 2e 20 20 | in that| hunk. |
|00005830| 54 68 65 20 68 75 6e 6b | 73 0a 63 6f 6e 74 61 69 |The hunk|s.contai|
|00005840| 6e 20 63 6f 70 69 65 73 | 20 6f 66 20 74 77 6f 20 |n copies| of two |
|00005850| 6f 72 20 74 68 72 65 65 | 20 73 65 74 73 20 6f 66 |or three| sets of|
|00005860| 20 69 6e 70 75 74 20 6c | 69 6e 65 73 20 65 61 63 | input l|ines eac|
|00005870| 68 20 70 72 65 63 65 64 | 65 64 20 62 79 20 6f 6e |h preced|ed by on|
|00005880| 65 0a 6f 72 20 74 77 6f | 20 63 6f 6d 6d 61 6e 64 |e.or two| command|
|00005890| 73 20 69 64 65 6e 74 69 | 66 79 69 6e 67 20 77 68 |s identi|fying wh|
|000058a0| 65 72 65 20 74 68 65 20 | 6c 69 6e 65 73 20 63 61 |ere the |lines ca|
|000058b0| 6d 65 20 66 72 6f 6d 2e | 0a 0a 20 20 20 4e 6f 72 |me from.|.. Nor|
|000058c0| 6d 61 6c 6c 79 2c 20 74 | 77 6f 20 73 70 61 63 65 |mally, t|wo space|
|000058d0| 73 20 70 72 65 63 65 64 | 65 20 65 61 63 68 20 63 |s preced|e each c|
|000058e0| 6f 70 79 20 6f 66 20 61 | 6e 20 69 6e 70 75 74 20 |opy of a|n input |
|000058f0| 6c 69 6e 65 20 74 6f 0a | 64 69 73 74 69 6e 67 75 |line to.|distingu|
|00005900| 69 73 68 20 69 74 20 66 | 72 6f 6d 20 74 68 65 20 |ish it f|rom the |
|00005910| 63 6f 6d 6d 61 6e 64 73 | 2e 20 20 42 75 74 20 77 |commands|. But w|
|00005920| 69 74 68 20 74 68 65 20 | 60 2d 54 27 20 6f 72 20 |ith the |`-T' or |
|00005930| 60 2d 2d 69 6e 69 74 69 | 61 6c 2d 74 61 62 27 0a |`--initi|al-tab'.|
|00005940| 6f 70 74 69 6f 6e 2c 20 | 60 64 69 66 66 33 27 20 |option, |`diff3' |
|00005950| 75 73 65 73 20 61 20 74 | 61 62 20 69 6e 73 74 65 |uses a t|ab inste|
|00005960| 61 64 20 6f 66 20 74 77 | 6f 20 73 70 61 63 65 73 |ad of tw|o spaces|
|00005970| 3b 20 74 68 69 73 20 6c | 69 6e 65 73 20 75 70 20 |; this l|ines up |
|00005980| 74 61 62 73 0a 63 6f 72 | 72 65 63 74 6c 79 2e 20 |tabs.cor|rectly. |
|00005990| 20 2a 4e 6f 74 65 20 54 | 61 62 73 3a 3a 2c 20 66 | *Note T|abs::, f|
|000059a0| 6f 72 20 6d 6f 72 65 20 | 69 6e 66 6f 72 6d 61 74 |or more |informat|
|000059b0| 69 6f 6e 2e 0a 0a 20 20 | 20 43 6f 6d 6d 61 6e 64 |ion... | Command|
|000059c0| 73 20 74 61 6b 65 20 74 | 68 65 20 66 6f 6c 6c 6f |s take t|he follo|
|000059d0| 77 69 6e 67 20 66 6f 72 | 6d 73 3a 0a 0a 60 46 49 |wing for|ms:..`FI|
|000059e0| 4c 45 3a 4c 61 27 0a 20 | 20 20 20 20 54 68 69 73 |LE:La'. | This|
|000059f0| 20 68 75 6e 6b 20 61 70 | 70 65 61 72 73 20 61 66 | hunk ap|pears af|
|00005a00| 74 65 72 20 6c 69 6e 65 | 20 4c 20 6f 66 20 66 69 |ter line| L of fi|
|00005a10| 6c 65 20 46 49 4c 45 2c | 20 61 6e 64 20 63 6f 6e |le FILE,| and con|
|00005a20| 74 61 69 6e 73 20 6e 6f | 20 6c 69 6e 65 73 0a 20 |tains no| lines. |
|00005a30| 20 20 20 20 69 6e 20 74 | 68 61 74 20 66 69 6c 65 | in t|hat file|
|00005a40| 2e 20 20 54 6f 20 65 64 | 69 74 20 74 68 69 73 20 |. To ed|it this |
|00005a50| 66 69 6c 65 20 74 6f 20 | 79 69 65 6c 64 20 74 68 |file to |yield th|
|00005a60| 65 20 6f 74 68 65 72 20 | 66 69 6c 65 73 2c 20 6f |e other |files, o|
|00005a70| 6e 65 0a 20 20 20 20 20 | 6d 75 73 74 20 61 70 70 |ne. |must app|
|00005a80| 65 6e 64 20 68 75 6e 6b | 20 6c 69 6e 65 73 20 74 |end hunk| lines t|
|00005a90| 61 6b 65 6e 20 66 72 6f | 6d 20 74 68 65 20 6f 74 |aken fro|m the ot|
|00005aa0| 68 65 72 20 66 69 6c 65 | 73 2e 20 20 46 6f 72 20 |her file|s. For |
|00005ab0| 65 78 61 6d 70 6c 65 2c | 0a 20 20 20 20 20 60 31 |example,|. `1|
|00005ac0| 3a 31 31 61 27 20 6d 65 | 61 6e 73 20 74 68 61 74 |:11a' me|ans that|
|00005ad0| 20 74 68 65 20 68 75 6e | 6b 20 66 6f 6c 6c 6f 77 | the hun|k follow|
|00005ae0| 73 20 6c 69 6e 65 20 31 | 31 20 69 6e 20 74 68 65 |s line 1|1 in the|
|00005af0| 20 66 69 72 73 74 20 66 | 69 6c 65 20 61 6e 64 0a | first f|ile and.|
|00005b00| 20 20 20 20 20 63 6f 6e | 74 61 69 6e 73 20 6e 6f | con|tains no|
|00005b10| 20 6c 69 6e 65 73 20 66 | 72 6f 6d 20 74 68 61 74 | lines f|rom that|
|00005b20| 20 66 69 6c 65 2e 0a 0a | 60 46 49 4c 45 3a 52 63 | file...|`FILE:Rc|
|00005b30| 27 0a 20 20 20 20 20 54 | 68 69 73 20 68 75 6e 6b |'. T|his hunk|
|00005b40| 20 63 6f 6e 74 61 69 6e | 73 20 74 68 65 20 6c 69 | contain|s the li|
|00005b50| 6e 65 73 20 69 6e 20 74 | 68 65 20 72 61 6e 67 65 |nes in t|he range|
|00005b60| 20 52 20 6f 66 20 66 69 | 6c 65 20 46 49 4c 45 2e | R of fi|le FILE.|
|00005b70| 20 20 54 68 65 0a 20 20 | 20 20 20 72 61 6e 67 65 | The. | range|
|00005b80| 20 52 20 69 73 20 61 20 | 63 6f 6d 6d 61 2d 73 65 | R is a |comma-se|
|00005b90| 70 61 72 61 74 65 64 20 | 70 61 69 72 20 6f 66 20 |parated |pair of |
|00005ba0| 6c 69 6e 65 20 6e 75 6d | 62 65 72 73 2c 20 6f 72 |line num|bers, or|
|00005bb0| 20 6a 75 73 74 20 6f 6e | 65 0a 20 20 20 20 20 6e | just on|e. n|
|00005bc0| 75 6d 62 65 72 20 69 66 | 20 74 68 65 20 72 61 6e |umber if| the ran|
|00005bd0| 67 65 20 69 73 20 61 20 | 73 69 6e 67 6c 65 74 6f |ge is a |singleto|
|00005be0| 6e 2e 20 20 54 6f 20 65 | 64 69 74 20 74 68 69 73 |n. To e|dit this|
|00005bf0| 20 66 69 6c 65 20 74 6f | 20 79 69 65 6c 64 20 74 | file to| yield t|
|00005c00| 68 65 0a 20 20 20 20 20 | 6f 74 68 65 72 20 66 69 |he. |other fi|
|00005c10| 6c 65 73 2c 20 6f 6e 65 | 20 6d 75 73 74 20 63 68 |les, one| must ch|
|00005c20| 61 6e 67 65 20 74 68 65 | 20 73 70 65 63 69 66 69 |ange the| specifi|
|00005c30| 65 64 20 6c 69 6e 65 73 | 20 74 6f 20 62 65 20 74 |ed lines| to be t|
|00005c40| 68 65 20 6c 69 6e 65 73 | 0a 20 20 20 20 20 74 61 |he lines|. ta|
|00005c50| 6b 65 6e 20 66 72 6f 6d | 20 74 68 65 20 6f 74 68 |ken from| the oth|
|00005c60| 65 72 20 66 69 6c 65 73 | 2e 20 20 46 6f 72 20 65 |er files|. For e|
|00005c70| 78 61 6d 70 6c 65 2c 20 | 60 32 3a 31 31 2c 31 33 |xample, |`2:11,13|
|00005c80| 63 27 20 6d 65 61 6e 73 | 20 74 68 61 74 0a 20 20 |c' means| that. |
|00005c90| 20 20 20 74 68 65 20 68 | 75 6e 6b 20 63 6f 6e 74 | the h|unk cont|
|00005ca0| 61 69 6e 73 20 6c 69 6e | 65 73 20 31 31 20 74 68 |ains lin|es 11 th|
|00005cb0| 72 6f 75 67 68 20 31 33 | 20 66 72 6f 6d 20 74 68 |rough 13| from th|
|00005cc0| 65 20 73 65 63 6f 6e 64 | 20 66 69 6c 65 2e 0a 0a |e second| file...|
|00005cd0| 20 20 20 49 66 20 74 68 | 65 20 6c 61 73 74 20 6c | If th|e last l|
|00005ce0| 69 6e 65 20 69 6e 20 61 | 20 73 65 74 20 6f 66 20 |ine in a| set of |
|00005cf0| 69 6e 70 75 74 20 6c 69 | 6e 65 73 20 69 73 20 69 |input li|nes is i|
|00005d00| 6e 63 6f 6d 70 6c 65 74 | 65 20 28 2a 6e 6f 74 65 |ncomplet|e (*note|
|00005d10| 0a 49 6e 63 6f 6d 70 6c | 65 74 65 20 4c 69 6e 65 |.Incompl|ete Line|
|00005d20| 73 3a 3a 2e 29 2c 20 69 | 74 20 69 73 20 64 69 73 |s::.), i|t is dis|
|00005d30| 74 69 6e 67 75 69 73 68 | 65 64 20 6f 6e 20 6f 75 |tinguish|ed on ou|
|00005d40| 74 70 75 74 20 66 72 6f | 6d 20 61 20 66 75 6c 6c |tput fro|m a full|
|00005d50| 20 6c 69 6e 65 20 62 79 | 0a 61 20 66 6f 6c 6c 6f | line by|.a follo|
|00005d60| 77 69 6e 67 20 6c 69 6e | 65 20 74 68 61 74 20 73 |wing lin|e that s|
|00005d70| 74 61 72 74 73 20 77 69 | 74 68 20 60 5c 27 2e 0a |tarts wi|th `\'..|
|00005d80| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|00005d90| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 64 69 66 66 33 |fo, Nod|e: diff3|
|00005da0| 20 48 75 6e 6b 73 2c 20 | 20 4e 65 78 74 3a 20 45 | Hunks, | Next: E|
|00005db0| 78 61 6d 70 6c 65 20 64 | 69 66 66 33 20 4e 6f 72 |xample d|iff3 Nor|
|00005dc0| 6d 61 6c 2c 20 20 50 72 | 65 76 3a 20 44 65 74 61 |mal, Pr|ev: Deta|
|00005dd0| 69 6c 65 64 20 64 69 66 | 66 33 20 4e 6f 72 6d 61 |iled dif|f3 Norma|
|00005de0| 6c 2c 20 20 55 70 3a 20 | 43 6f 6d 70 61 72 69 6e |l, Up: |Comparin|
|00005df0| 67 20 54 68 72 65 65 20 | 46 69 6c 65 73 0a 0a 60 |g Three |Files..`|
|00005e00| 64 69 66 66 33 27 20 48 | 75 6e 6b 73 0a 3d 3d 3d |diff3' H|unks.===|
|00005e10| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 0a 0a 20 20 20 47 |========|==.. G|
|00005e20| 72 6f 75 70 73 20 6f 66 | 20 6c 69 6e 65 73 20 74 |roups of| lines t|
|00005e30| 68 61 74 20 64 69 66 66 | 65 72 20 69 6e 20 74 77 |hat diff|er in tw|
|00005e40| 6f 20 6f 72 20 74 68 72 | 65 65 20 6f 66 20 74 68 |o or thr|ee of th|
|00005e50| 65 20 69 6e 70 75 74 20 | 66 69 6c 65 73 20 61 72 |e input |files ar|
|00005e60| 65 0a 63 61 6c 6c 65 64 | 20 22 64 69 66 66 33 20 |e.called| "diff3 |
|00005e70| 68 75 6e 6b 73 22 2c 20 | 62 79 20 61 6e 61 6c 6f |hunks", |by analo|
|00005e80| 67 79 20 77 69 74 68 20 | 60 64 69 66 66 27 20 68 |gy with |`diff' h|
|00005e90| 75 6e 6b 73 20 28 2a 6e | 6f 74 65 20 48 75 6e 6b |unks (*n|ote Hunk|
|00005ea0| 73 3a 3a 2e 29 2e 0a 49 | 66 20 61 6c 6c 20 74 68 |s::.)..I|f all th|
|00005eb0| 72 65 65 20 69 6e 70 75 | 74 20 66 69 6c 65 73 20 |ree inpu|t files |
|00005ec0| 64 69 66 66 65 72 20 69 | 6e 20 61 20 60 64 69 66 |differ i|n a `dif|
|00005ed0| 66 33 27 20 68 75 6e 6b | 2c 20 74 68 65 20 68 75 |f3' hunk|, the hu|
|00005ee0| 6e 6b 20 69 73 20 63 61 | 6c 6c 65 64 20 61 0a 22 |nk is ca|lled a."|
|00005ef0| 74 68 72 65 65 2d 77 61 | 79 20 68 75 6e 6b 22 3b |three-wa|y hunk";|
|00005f00| 20 69 66 20 6a 75 73 74 | 20 74 77 6f 20 69 6e 70 | if just| two inp|
|00005f10| 75 74 20 66 69 6c 65 73 | 20 64 69 66 66 65 72 2c |ut files| differ,|
|00005f20| 20 69 74 20 69 73 20 61 | 20 22 74 77 6f 2d 77 61 | it is a| "two-wa|
|00005f30| 79 0a 68 75 6e 6b 22 2e | 0a 0a 20 20 20 41 73 20 |y.hunk".|.. As |
|00005f40| 77 69 74 68 20 60 64 69 | 66 66 27 2c 20 73 65 76 |with `di|ff', sev|
|00005f50| 65 72 61 6c 20 73 6f 6c | 75 74 69 6f 6e 73 20 61 |eral sol|utions a|
|00005f60| 72 65 20 70 6f 73 73 69 | 62 6c 65 2e 20 20 57 68 |re possi|ble. Wh|
|00005f70| 65 6e 20 63 6f 6d 70 61 | 72 69 6e 67 20 74 68 65 |en compa|ring the|
|00005f80| 0a 66 69 6c 65 73 20 60 | 41 27 2c 20 60 42 27 2c |.files `|A', `B',|
|00005f90| 20 61 6e 64 20 60 43 27 | 2c 20 60 64 69 66 66 33 | and `C'|, `diff3|
|00005fa0| 27 20 6e 6f 72 6d 61 6c | 6c 79 20 66 69 6e 64 73 |' normal|ly finds|
|00005fb0| 20 60 64 69 66 66 33 27 | 20 68 75 6e 6b 73 20 62 | `diff3'| hunks b|
|00005fc0| 79 0a 6d 65 72 67 69 6e | 67 20 74 68 65 20 74 77 |y.mergin|g the tw|
|00005fd0| 6f 2d 77 61 79 20 68 75 | 6e 6b 73 20 6f 75 74 70 |o-way hu|nks outp|
|00005fe0| 75 74 20 62 79 20 74 68 | 65 20 74 77 6f 20 63 6f |ut by th|e two co|
|00005ff0| 6d 6d 61 6e 64 73 20 60 | 64 69 66 66 20 41 20 42 |mmands `|diff A B|
|00006000| 27 20 61 6e 64 0a 60 64 | 69 66 66 20 41 20 43 27 |' and.`d|iff A C'|
|00006010| 2e 20 20 54 68 69 73 20 | 64 6f 65 73 20 6e 6f 74 |. This |does not|
|00006020| 20 6e 65 63 65 73 73 61 | 72 69 6c 79 20 6d 69 6e | necessa|rily min|
|00006030| 69 6d 69 7a 65 20 74 68 | 65 20 73 69 7a 65 20 6f |imize th|e size o|
|00006040| 66 20 74 68 65 20 6f 75 | 74 70 75 74 2c 0a 62 75 |f the ou|tput,.bu|
|00006050| 74 20 65 78 63 65 70 74 | 69 6f 6e 73 20 73 68 6f |t except|ions sho|
|00006060| 75 6c 64 20 62 65 20 72 | 61 72 65 2e 0a 0a 20 20 |uld be r|are... |
|00006070| 20 46 6f 72 20 65 78 61 | 6d 70 6c 65 2c 20 73 75 | For exa|mple, su|
|00006080| 70 70 6f 73 65 20 60 46 | 27 20 63 6f 6e 74 61 69 |ppose `F|' contai|
|00006090| 6e 73 20 74 68 65 20 74 | 68 72 65 65 20 6c 69 6e |ns the t|hree lin|
|000060a0| 65 73 20 60 61 27 2c 20 | 60 62 27 2c 20 60 66 27 |es `a', |`b', `f'|
|000060b0| 2c 20 60 47 27 0a 63 6f | 6e 74 61 69 6e 73 20 74 |, `G'.co|ntains t|
|000060c0| 68 65 20 6c 69 6e 65 73 | 20 60 67 27 2c 20 60 62 |he lines| `g', `b|
|000060d0| 27 2c 20 60 67 27 2c 20 | 61 6e 64 20 60 48 27 20 |', `g', |and `H' |
|000060e0| 63 6f 6e 74 61 69 6e 73 | 20 74 68 65 20 6c 69 6e |contains| the lin|
|000060f0| 65 73 20 60 61 27 2c 20 | 60 62 27 2c 0a 60 68 27 |es `a', |`b',.`h'|
|00006100| 2e 20 20 60 64 69 66 66 | 33 20 46 20 47 20 48 27 |. `diff|3 F G H'|
|00006110| 20 6d 69 67 68 74 20 6f | 75 74 70 75 74 20 74 68 | might o|utput th|
|00006120| 65 20 66 6f 6c 6c 6f 77 | 69 6e 67 3a 0a 0a 20 20 |e follow|ing:.. |
|00006130| 20 20 20 3d 3d 3d 3d 32 | 0a 20 20 20 20 20 31 3a | ====2|. 1:|
|00006140| 31 63 0a 20 20 20 20 20 | 33 3a 31 63 0a 20 20 20 |1c. |3:1c. |
|00006150| 20 20 20 20 61 0a 20 20 | 20 20 20 32 3a 31 63 0a | a. | 2:1c.|
|00006160| 20 20 20 20 20 20 20 67 | 0a 20 20 20 20 20 3d 3d | g|. ==|
|00006170| 3d 3d 0a 20 20 20 20 20 | 31 3a 33 63 0a 20 20 20 |==. |1:3c. |
|00006180| 20 20 20 20 66 0a 20 20 | 20 20 20 32 3a 33 63 0a | f. | 2:3c.|
|00006190| 20 20 20 20 20 20 20 67 | 0a 20 20 20 20 20 33 3a | g|. 3:|
|000061a0| 33 63 0a 20 20 20 20 20 | 20 20 68 0a 0a 62 65 63 |3c. | h..bec|
|000061b0| 61 75 73 65 20 69 74 20 | 66 6f 75 6e 64 20 61 20 |ause it |found a |
|000061c0| 74 77 6f 2d 77 61 79 20 | 68 75 6e 6b 20 63 6f 6e |two-way |hunk con|
|000061d0| 74 61 69 6e 69 6e 67 20 | 60 61 27 20 69 6e 20 74 |taining |`a' in t|
|000061e0| 68 65 20 66 69 72 73 74 | 20 61 6e 64 20 74 68 69 |he first| and thi|
|000061f0| 72 64 0a 66 69 6c 65 73 | 20 61 6e 64 20 60 67 27 |rd.files| and `g'|
|00006200| 20 69 6e 20 74 68 65 20 | 73 65 63 6f 6e 64 20 66 | in the |second f|
|00006210| 69 6c 65 2c 20 74 68 65 | 6e 20 74 68 65 20 73 69 |ile, the|n the si|
|00006220| 6e 67 6c 65 20 6c 69 6e | 65 20 60 62 27 20 63 6f |ngle lin|e `b' co|
|00006230| 6d 6d 6f 6e 20 74 6f 0a | 61 6c 6c 20 74 68 72 65 |mmon to.|all thre|
|00006240| 65 20 66 69 6c 65 73 2c | 20 74 68 65 6e 20 61 20 |e files,| then a |
|00006250| 74 68 72 65 65 2d 77 61 | 79 20 68 75 6e 6b 20 63 |three-wa|y hunk c|
|00006260| 6f 6e 74 61 69 6e 69 6e | 67 20 74 68 65 20 6c 61 |ontainin|g the la|
|00006270| 73 74 20 6c 69 6e 65 20 | 6f 66 20 65 61 63 68 0a |st line |of each.|
|00006280| 66 69 6c 65 2e 0a 0a 1f | 0a 46 69 6c 65 3a 20 64 |file....|.File: d|
|00006290| 69 66 66 2e 69 6e 66 6f | 2c 20 20 4e 6f 64 65 3a |iff.info|, Node:|
|000062a0| 20 45 78 61 6d 70 6c 65 | 20 64 69 66 66 33 20 4e | Example| diff3 N|
|000062b0| 6f 72 6d 61 6c 2c 20 20 | 50 72 65 76 3a 20 64 69 |ormal, |Prev: di|
|000062c0| 66 66 33 20 48 75 6e 6b | 73 2c 20 20 55 70 3a 20 |ff3 Hunk|s, Up: |
|000062d0| 43 6f 6d 70 61 72 69 6e | 67 20 54 68 72 65 65 20 |Comparin|g Three |
|000062e0| 46 69 6c 65 73 0a 0a 41 | 6e 20 45 78 61 6d 70 6c |Files..A|n Exampl|
|000062f0| 65 20 6f 66 20 60 64 69 | 66 66 33 27 20 4e 6f 72 |e of `di|ff3' Nor|
|00006300| 6d 61 6c 20 46 6f 72 6d | 61 74 0a 3d 3d 3d 3d 3d |mal Form|at.=====|
|00006310| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006320| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 0a 0a |========|======..|
|00006330| 20 20 20 48 65 72 65 20 | 69 73 20 74 68 65 20 6f | Here |is the o|
|00006340| 75 74 70 75 74 20 6f 66 | 20 74 68 65 20 63 6f 6d |utput of| the com|
|00006350| 6d 61 6e 64 20 60 64 69 | 66 66 33 20 6c 61 6f 20 |mand `di|ff3 lao |
|00006360| 74 7a 75 20 74 61 6f 27 | 20 28 2a 6e 6f 74 65 20 |tzu tao'| (*note |
|00006370| 53 61 6d 70 6c 65 0a 64 | 69 66 66 33 20 49 6e 70 |Sample.d|iff3 Inp|
|00006380| 75 74 3a 3a 2e 2c 20 66 | 6f 72 20 74 68 65 20 63 |ut::., f|or the c|
|00006390| 6f 6d 70 6c 65 74 65 20 | 63 6f 6e 74 65 6e 74 73 |omplete |contents|
|000063a0| 20 6f 66 20 74 68 65 20 | 66 69 6c 65 73 29 2e 20 | of the |files). |
|000063b0| 20 4e 6f 74 69 63 65 20 | 74 68 61 74 0a 69 74 20 | Notice |that.it |
|000063c0| 73 68 6f 77 73 20 6f 6e | 6c 79 20 74 68 65 20 6c |shows on|ly the l|
|000063d0| 69 6e 65 73 20 74 68 61 | 74 20 61 72 65 20 64 69 |ines tha|t are di|
|000063e0| 66 66 65 72 65 6e 74 20 | 61 6d 6f 6e 67 20 74 68 |fferent |among th|
|000063f0| 65 20 74 68 72 65 65 20 | 66 69 6c 65 73 2e 0a 0a |e three |files...|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
