home *** CD-ROM | disk | FTP | other *** search
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: LaTeX Document
(document/latex).
You can browse this item here: diff.info-2
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 100%
| dexvert
| LaTeX Document (document/latex)
| magic
| Supported |
| 100%
| dexvert
| GNU Info File (text/gnuInfo)
| magic
| Supported |
| 1%
| dexvert
| Text File (text/txt)
| fallback
| Supported |
| 100%
| file
| data
| default
| |
| 100%
| TrID
| GNU Info document
| default (weak)
| |
| 100%
| dexmagic
| GNU Info
| default
| |
| 100%
| perlTextCheck
| Likely Text (Perl)
| default
| |
| 100%
| siegfried
| fmt/281 LaTeX (Subdocument)
| default
| |
| 100%
| detectItEasy
| Format: plain text[LF]
| default (weak)
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 54 68 69 73 20 69 73 20 | 49 6e 66 6f 20 66 69 6c |This is |Info fil|
|00000010| 65 20 64 69 66 66 2e 69 | 6e 66 6f 2c 20 70 72 6f |e diff.i|nfo, pro|
|00000020| 64 75 63 65 64 20 62 79 | 20 4d 61 6b 65 69 6e 66 |duced by| Makeinf|
|00000030| 6f 2d 31 2e 35 35 20 66 | 72 6f 6d 20 74 68 65 20 |o-1.55 f|rom the |
|00000040| 69 6e 70 75 74 0a 66 69 | 6c 65 20 2e 2f 64 69 66 |input.fi|le ./dif|
|00000050| 66 2e 74 65 78 69 2e 0a | 0a 20 20 20 54 68 69 73 |f.texi..|. This|
|00000060| 20 66 69 6c 65 20 64 6f | 63 75 6d 65 6e 74 73 20 | file do|cuments |
|00000070| 74 68 65 20 74 68 65 20 | 47 4e 55 20 60 64 69 66 |the the |GNU `dif|
|00000080| 66 27 2c 20 60 64 69 66 | 66 33 27 2c 20 60 73 64 |f', `dif|f3', `sd|
|00000090| 69 66 66 27 2c 20 61 6e | 64 20 60 63 6d 70 27 0a |iff', an|d `cmp'.|
|000000a0| 63 6f 6d 6d 61 6e 64 73 | 20 66 6f 72 20 73 68 6f |commands| for sho|
|000000b0| 77 69 6e 67 20 74 68 65 | 20 64 69 66 66 65 72 65 |wing the| differe|
|000000c0| 6e 63 65 73 20 62 65 74 | 77 65 65 6e 20 74 65 78 |nces bet|ween tex|
|000000d0| 74 20 66 69 6c 65 73 20 | 61 6e 64 20 74 68 65 20 |t files |and the |
|000000e0| 60 70 61 74 63 68 27 0a | 63 6f 6d 6d 61 6e 64 20 |`patch'.|command |
|000000f0| 66 6f 72 20 75 73 69 6e | 67 20 74 68 65 69 72 20 |for usin|g their |
|00000100| 6f 75 74 70 75 74 20 74 | 6f 20 75 70 64 61 74 65 |output t|o update|
|00000110| 20 66 69 6c 65 73 2e 0a | 0a 20 20 20 43 6f 70 79 | files..|. Copy|
|00000120| 72 69 67 68 74 20 28 43 | 29 20 31 39 39 32 2c 20 |right (C|) 1992, |
|00000130| 31 39 39 33 20 46 72 65 | 65 20 53 6f 66 74 77 61 |1993 Fre|e Softwa|
|00000140| 72 65 20 46 6f 75 6e 64 | 61 74 69 6f 6e 2c 20 49 |re Found|ation, I|
|00000150| 6e 63 2e 0a 0a 20 20 20 | 50 65 72 6d 69 73 73 69 |nc... |Permissi|
|00000160| 6f 6e 20 69 73 20 67 72 | 61 6e 74 65 64 20 74 6f |on is gr|anted to|
|00000170| 20 6d 61 6b 65 20 61 6e | 64 20 64 69 73 74 72 69 | make an|d distri|
|00000180| 62 75 74 65 20 76 65 72 | 62 61 74 69 6d 20 63 6f |bute ver|batim co|
|00000190| 70 69 65 73 20 6f 66 20 | 74 68 69 73 0a 6d 61 6e |pies of |this.man|
|000001a0| 75 61 6c 20 70 72 6f 76 | 69 64 65 64 20 74 68 65 |ual prov|ided the|
|000001b0| 20 63 6f 70 79 72 69 67 | 68 74 20 6e 6f 74 69 63 | copyrig|ht notic|
|000001c0| 65 20 61 6e 64 20 74 68 | 69 73 20 70 65 72 6d 69 |e and th|is permi|
|000001d0| 73 73 69 6f 6e 20 6e 6f | 74 69 63 65 20 61 72 65 |ssion no|tice are|
|000001e0| 0a 70 72 65 73 65 72 76 | 65 64 20 6f 6e 20 61 6c |.preserv|ed on al|
|000001f0| 6c 20 63 6f 70 69 65 73 | 2e 0a 0a 20 20 20 50 65 |l copies|... Pe|
|00000200| 72 6d 69 73 73 69 6f 6e | 20 69 73 20 67 72 61 6e |rmission| is gran|
|00000210| 74 65 64 20 74 6f 20 63 | 6f 70 79 20 61 6e 64 20 |ted to c|opy and |
|00000220| 64 69 73 74 72 69 62 75 | 74 65 20 6d 6f 64 69 66 |distribu|te modif|
|00000230| 69 65 64 20 76 65 72 73 | 69 6f 6e 73 20 6f 66 0a |ied vers|ions of.|
|00000240| 74 68 69 73 20 6d 61 6e | 75 61 6c 20 75 6e 64 65 |this man|ual unde|
|00000250| 72 20 74 68 65 20 63 6f | 6e 64 69 74 69 6f 6e 73 |r the co|nditions|
|00000260| 20 66 6f 72 20 76 65 72 | 62 61 74 69 6d 20 63 6f | for ver|batim co|
|00000270| 70 79 69 6e 67 2c 20 70 | 72 6f 76 69 64 65 64 20 |pying, p|rovided |
|00000280| 74 68 61 74 0a 74 68 65 | 20 65 6e 74 69 72 65 20 |that.the| entire |
|00000290| 72 65 73 75 6c 74 69 6e | 67 20 64 65 72 69 76 65 |resultin|g derive|
|000002a0| 64 20 77 6f 72 6b 20 69 | 73 20 64 69 73 74 72 69 |d work i|s distri|
|000002b0| 62 75 74 65 64 20 75 6e | 64 65 72 20 74 68 65 20 |buted un|der the |
|000002c0| 74 65 72 6d 73 20 6f 66 | 20 61 0a 70 65 72 6d 69 |terms of| a.permi|
|000002d0| 73 73 69 6f 6e 20 6e 6f | 74 69 63 65 20 69 64 65 |ssion no|tice ide|
|000002e0| 6e 74 69 63 61 6c 20 74 | 6f 20 74 68 69 73 20 6f |ntical t|o this o|
|000002f0| 6e 65 2e 0a 0a 20 20 20 | 50 65 72 6d 69 73 73 69 |ne... |Permissi|
|00000300| 6f 6e 20 69 73 20 67 72 | 61 6e 74 65 64 20 74 6f |on is gr|anted to|
|00000310| 20 63 6f 70 79 20 61 6e | 64 20 64 69 73 74 72 69 | copy an|d distri|
|00000320| 62 75 74 65 20 74 72 61 | 6e 73 6c 61 74 69 6f 6e |bute tra|nslation|
|00000330| 73 20 6f 66 20 74 68 69 | 73 0a 6d 61 6e 75 61 6c |s of thi|s.manual|
|00000340| 20 69 6e 74 6f 20 61 6e | 6f 74 68 65 72 20 6c 61 | into an|other la|
|00000350| 6e 67 75 61 67 65 2c 20 | 75 6e 64 65 72 20 74 68 |nguage, |under th|
|00000360| 65 20 61 62 6f 76 65 20 | 63 6f 6e 64 69 74 69 6f |e above |conditio|
|00000370| 6e 73 20 66 6f 72 20 6d | 6f 64 69 66 69 65 64 0a |ns for m|odified.|
|00000380| 76 65 72 73 69 6f 6e 73 | 2c 20 65 78 63 65 70 74 |versions|, except|
|00000390| 20 74 68 61 74 20 74 68 | 69 73 20 70 65 72 6d 69 | that th|is permi|
|000003a0| 73 73 69 6f 6e 20 6e 6f | 74 69 63 65 20 6d 61 79 |ssion no|tice may|
|000003b0| 20 62 65 20 73 74 61 74 | 65 64 20 69 6e 20 61 0a | be stat|ed in a.|
|000003c0| 74 72 61 6e 73 6c 61 74 | 69 6f 6e 20 61 70 70 72 |translat|ion appr|
|000003d0| 6f 76 65 64 20 62 79 20 | 74 68 65 20 46 6f 75 6e |oved by |the Foun|
|000003e0| 64 61 74 69 6f 6e 2e 0a | 0a 1f 0a 46 69 6c 65 3a |dation..|...File:|
|000003f0| 20 64 69 66 66 2e 69 6e | 66 6f 2c 20 20 4e 6f 64 | diff.in|fo, Nod|
|00000400| 65 3a 20 4c 69 6e 65 20 | 47 72 6f 75 70 20 46 6f |e: Line |Group Fo|
|00000410| 72 6d 61 74 73 2c 20 20 | 4e 65 78 74 3a 20 4c 69 |rmats, |Next: Li|
|00000420| 6e 65 20 46 6f 72 6d 61 | 74 73 2c 20 20 55 70 3a |ne Forma|ts, Up:|
|00000430| 20 49 66 2d 74 68 65 6e | 2d 65 6c 73 65 0a 0a 4c | If-then|-else..L|
|00000440| 69 6e 65 20 47 72 6f 75 | 70 20 46 6f 72 6d 61 74 |ine Grou|p Format|
|00000450| 73 0a 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |s.------|--------|
|00000460| 2d 2d 2d 2d 0a 0a 20 20 | 20 4c 69 6e 65 20 67 72 |----.. | Line gr|
|00000470| 6f 75 70 20 66 6f 72 6d | 61 74 73 20 6c 65 74 20 |oup form|ats let |
|00000480| 79 6f 75 20 73 70 65 63 | 69 66 79 20 66 6f 72 6d |you spec|ify form|
|00000490| 61 74 73 20 73 75 69 74 | 61 62 6c 65 20 66 6f 72 |ats suit|able for|
|000004a0| 20 6d 61 6e 79 0a 61 70 | 70 6c 69 63 61 74 69 6f | many.ap|plicatio|
|000004b0| 6e 73 20 74 68 61 74 20 | 61 6c 6c 6f 77 20 69 66 |ns that |allow if|
|000004c0| 2d 74 68 65 6e 2d 65 6c | 73 65 20 69 6e 70 75 74 |-then-el|se input|
|000004d0| 2c 20 69 6e 63 6c 75 64 | 69 6e 67 20 70 72 6f 67 |, includ|ing prog|
|000004e0| 72 61 6d 6d 69 6e 67 0a | 6c 61 6e 67 75 61 67 65 |ramming.|language|
|000004f0| 73 20 61 6e 64 20 74 65 | 78 74 20 66 6f 72 6d 61 |s and te|xt forma|
|00000500| 74 74 69 6e 67 20 6c 61 | 6e 67 75 61 67 65 73 2e |tting la|nguages.|
|00000510| 20 20 41 20 6c 69 6e 65 | 20 67 72 6f 75 70 20 66 | A line| group f|
|00000520| 6f 72 6d 61 74 20 73 70 | 65 63 69 66 69 65 73 0a |ormat sp|ecifies.|
|00000530| 74 68 65 20 6f 75 74 70 | 75 74 20 66 6f 72 6d 61 |the outp|ut forma|
|00000540| 74 20 66 6f 72 20 61 20 | 63 6f 6e 74 69 67 75 6f |t for a |contiguo|
|00000550| 75 73 20 67 72 6f 75 70 | 20 6f 66 20 73 69 6d 69 |us group| of simi|
|00000560| 6c 61 72 20 6c 69 6e 65 | 73 2e 0a 0a 20 20 20 46 |lar line|s... F|
|00000570| 6f 72 20 65 78 61 6d 70 | 6c 65 2c 20 74 68 65 20 |or examp|le, the |
|00000580| 66 6f 6c 6c 6f 77 69 6e | 67 20 63 6f 6d 6d 61 6e |followin|g comman|
|00000590| 64 20 63 6f 6d 70 61 72 | 65 73 20 74 68 65 20 54 |d compar|es the T|
|000005a0| 65 58 20 66 69 6c 65 73 | 20 60 6f 6c 64 27 20 61 |eX files| `old' a|
|000005b0| 6e 64 0a 60 6e 65 77 27 | 2c 20 61 6e 64 20 6f 75 |nd.`new'|, and ou|
|000005c0| 74 70 75 74 73 20 61 20 | 6d 65 72 67 65 64 20 66 |tputs a |merged f|
|000005d0| 69 6c 65 20 69 6e 20 77 | 68 69 63 68 20 6f 6c 64 |ile in w|hich old|
|000005e0| 20 72 65 67 69 6f 6e 73 | 20 61 72 65 20 73 75 72 | regions| are sur|
|000005f0| 72 6f 75 6e 64 65 64 20 | 62 79 0a 60 5c 62 65 67 |rounded |by.`\beg|
|00000600| 69 6e 7b 65 6d 7d 27 2d | 60 5c 65 6e 64 7b 65 6d |in{em}'-|`\end{em|
|00000610| 7d 27 20 6c 69 6e 65 73 | 2c 20 61 6e 64 20 6e 65 |}' lines|, and ne|
|00000620| 77 20 72 65 67 69 6f 6e | 73 20 61 72 65 20 73 75 |w region|s are su|
|00000630| 72 72 6f 75 6e 64 65 64 | 20 62 79 0a 60 5c 62 65 |rrounded| by.`\be|
|00000640| 67 69 6e 7b 62 66 7d 27 | 2d 60 5c 65 6e 64 7b 62 |gin{bf}'|-`\end{b|
|00000650| 66 7d 27 20 6c 69 6e 65 | 73 2e 0a 0a 20 20 20 20 |f}' line|s... |
|00000660| 20 64 69 66 66 20 5c 0a | 20 20 20 20 20 20 20 20 | diff \.| |
|00000670| 2d 2d 6f 6c 64 2d 67 72 | 6f 75 70 2d 66 6f 72 6d |--old-gr|oup-form|
|00000680| 61 74 3d 27 5c 62 65 67 | 69 6e 7b 65 6d 7d 0a 20 |at='\beg|in{em}. |
|00000690| 20 20 20 20 25 3c 5c 65 | 6e 64 7b 65 6d 7d 0a 20 | %<\e|nd{em}. |
|000006a0| 20 20 20 20 27 20 5c 0a | 20 20 20 20 20 20 20 20 | ' \.| |
|000006b0| 2d 2d 6e 65 77 2d 67 72 | 6f 75 70 2d 66 6f 72 6d |--new-gr|oup-form|
|000006c0| 61 74 3d 27 5c 62 65 67 | 69 6e 7b 62 66 7d 0a 20 |at='\beg|in{bf}. |
|000006d0| 20 20 20 20 25 3e 5c 65 | 6e 64 7b 62 66 7d 0a 20 | %>\e|nd{bf}. |
|000006e0| 20 20 20 20 27 20 5c 0a | 20 20 20 20 20 20 20 20 | ' \.| |
|000006f0| 6f 6c 64 20 6e 65 77 0a | 0a 20 20 20 54 68 65 20 |old new.|. The |
|00000700| 66 6f 6c 6c 6f 77 69 6e | 67 20 63 6f 6d 6d 61 6e |followin|g comman|
|00000710| 64 20 69 73 20 65 71 75 | 69 76 61 6c 65 6e 74 20 |d is equ|ivalent |
|00000720| 74 6f 20 74 68 65 20 61 | 62 6f 76 65 20 65 78 61 |to the a|bove exa|
|00000730| 6d 70 6c 65 2c 20 62 75 | 74 20 69 74 20 69 73 20 |mple, bu|t it is |
|00000740| 61 0a 6c 69 74 74 6c 65 | 20 6d 6f 72 65 20 76 65 |a.little| more ve|
|00000750| 72 62 6f 73 65 2c 20 62 | 65 63 61 75 73 65 20 69 |rbose, b|ecause i|
|00000760| 74 20 73 70 65 6c 6c 73 | 20 6f 75 74 20 74 68 65 |t spells| out the|
|00000770| 20 64 65 66 61 75 6c 74 | 20 6c 69 6e 65 20 67 72 | default| line gr|
|00000780| 6f 75 70 0a 66 6f 72 6d | 61 74 73 2e 0a 0a 20 20 |oup.form|ats... |
|00000790| 20 20 20 64 69 66 66 20 | 5c 0a 20 20 20 20 20 20 | diff |\. |
|000007a0| 20 20 2d 2d 6f 6c 64 2d | 67 72 6f 75 70 2d 66 6f | --old-|group-fo|
|000007b0| 72 6d 61 74 3d 27 5c 62 | 65 67 69 6e 7b 65 6d 7d |rmat='\b|egin{em}|
|000007c0| 0a 20 20 20 20 20 25 3c | 5c 65 6e 64 7b 65 6d 7d |. %<|\end{em}|
|000007d0| 0a 20 20 20 20 20 27 20 | 5c 0a 20 20 20 20 20 20 |. ' |\. |
|000007e0| 20 20 2d 2d 6e 65 77 2d | 67 72 6f 75 70 2d 66 6f | --new-|group-fo|
|000007f0| 72 6d 61 74 3d 27 5c 62 | 65 67 69 6e 7b 62 66 7d |rmat='\b|egin{bf}|
|00000800| 0a 20 20 20 20 20 25 3e | 5c 65 6e 64 7b 62 66 7d |. %>|\end{bf}|
|00000810| 0a 20 20 20 20 20 27 20 | 5c 0a 20 20 20 20 20 20 |. ' |\. |
|00000820| 20 20 2d 2d 75 6e 63 68 | 61 6e 67 65 64 2d 67 72 | --unch|anged-gr|
|00000830| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 25 3d 27 20 |oup-form|at='%=' |
|00000840| 5c 0a 20 20 20 20 20 20 | 20 20 2d 2d 63 68 61 6e |\. | --chan|
|00000850| 67 65 64 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |ged-grou|p-format|
|00000860| 3d 27 5c 62 65 67 69 6e | 7b 65 6d 7d 0a 20 20 20 |='\begin|{em}. |
|00000870| 20 20 25 3c 5c 65 6e 64 | 7b 65 6d 7d 0a 20 20 20 | %<\end|{em}. |
|00000880| 20 20 5c 62 65 67 69 6e | 7b 62 66 7d 0a 20 20 20 | \begin|{bf}. |
|00000890| 20 20 25 3e 5c 65 6e 64 | 7b 62 66 7d 0a 20 20 20 | %>\end|{bf}. |
|000008a0| 20 20 27 20 5c 0a 20 20 | 20 20 20 20 20 20 6f 6c | ' \. | ol|
|000008b0| 64 20 6e 65 77 0a 0a 20 | 20 20 48 65 72 65 20 69 |d new.. | Here i|
|000008c0| 73 20 61 20 6d 6f 72 65 | 20 61 64 76 61 6e 63 65 |s a more| advance|
|000008d0| 64 20 65 78 61 6d 70 6c | 65 2c 20 77 68 69 63 68 |d exampl|e, which|
|000008e0| 20 6f 75 74 70 75 74 73 | 20 61 20 64 69 66 66 20 | outputs| a diff |
|000008f0| 6c 69 73 74 69 6e 67 20 | 77 69 74 68 0a 68 65 61 |listing |with.hea|
|00000900| 64 65 72 73 20 63 6f 6e | 74 61 69 6e 69 6e 67 20 |ders con|taining |
|00000910| 6c 69 6e 65 20 6e 75 6d | 62 65 72 73 20 69 6e 20 |line num|bers in |
|00000920| 61 20 22 70 6c 61 69 6e | 20 45 6e 67 6c 69 73 68 |a "plain| English|
|00000930| 22 20 73 74 79 6c 65 2e | 0a 0a 20 20 20 20 20 64 |" style.|.. d|
|00000940| 69 66 66 20 5c 0a 20 20 | 20 20 20 20 20 20 2d 2d |iff \. | --|
|00000950| 75 6e 63 68 61 6e 67 65 | 64 2d 67 72 6f 75 70 2d |unchange|d-group-|
|00000960| 66 6f 72 6d 61 74 3d 27 | 27 20 5c 0a 20 20 20 20 |format='|' \. |
|00000970| 20 20 20 20 2d 2d 6f 6c | 64 2d 67 72 6f 75 70 2d | --ol|d-group-|
|00000980| 66 6f 72 6d 61 74 3d 27 | 2d 2d 2d 2d 2d 2d 2d 2d |format='|--------|
|00000990| 20 25 64 6e 20 6c 69 6e | 65 25 28 6e 3d 31 3f 3a | %dn lin|e%(n=1?:|
|000009a0| 73 29 20 64 65 6c 65 74 | 65 64 20 61 74 20 25 64 |s) delet|ed at %d|
|000009b0| 66 3a 0a 20 20 20 20 20 | 25 3c 27 20 5c 0a 20 20 |f:. |%<' \. |
|000009c0| 20 20 20 20 20 20 2d 2d | 6e 65 77 2d 67 72 6f 75 | --|new-grou|
|000009d0| 70 2d 66 6f 72 6d 61 74 | 3d 27 2d 2d 2d 2d 2d 2d |p-format|='------|
|000009e0| 2d 2d 20 25 64 4e 20 6c | 69 6e 65 25 28 4e 3d 31 |-- %dN l|ine%(N=1|
|000009f0| 3f 3a 73 29 20 61 64 64 | 65 64 20 61 66 74 65 72 |?:s) add|ed after|
|00000a00| 20 25 64 65 3a 0a 20 20 | 20 20 20 25 3e 27 20 5c | %de:. | %>' \|
|00000a10| 0a 20 20 20 20 20 20 20 | 20 2d 2d 63 68 61 6e 67 |. | --chang|
|00000a20| 65 64 2d 67 72 6f 75 70 | 2d 66 6f 72 6d 61 74 3d |ed-group|-format=|
|00000a30| 27 2d 2d 2d 2d 2d 2d 2d | 2d 20 25 64 6e 20 6c 69 |'-------|- %dn li|
|00000a40| 6e 65 25 28 6e 3d 31 3f | 3a 73 29 20 63 68 61 6e |ne%(n=1?|:s) chan|
|00000a50| 67 65 64 20 61 74 20 25 | 64 66 3a 0a 20 20 20 20 |ged at %|df:. |
|00000a60| 20 25 3c 2d 2d 2d 2d 2d | 2d 2d 2d 20 74 6f 3a 0a | %<-----|--- to:.|
|00000a70| 20 20 20 20 20 25 3e 27 | 20 5c 0a 20 20 20 20 20 | %>'| \. |
|00000a80| 20 20 20 6f 6c 64 20 6e | 65 77 0a 0a 20 20 20 54 | old n|ew.. T|
|00000a90| 6f 20 73 70 65 63 69 66 | 79 20 61 20 6c 69 6e 65 |o specif|y a line|
|00000aa0| 20 67 72 6f 75 70 20 66 | 6f 72 6d 61 74 2c 20 75 | group f|ormat, u|
|00000ab0| 73 65 20 60 64 69 66 66 | 27 20 77 69 74 68 20 6f |se `diff|' with o|
|00000ac0| 6e 65 20 6f 66 20 74 68 | 65 20 6f 70 74 69 6f 6e |ne of th|e option|
|00000ad0| 73 0a 6c 69 73 74 65 64 | 20 62 65 6c 6f 77 2e 20 |s.listed| below. |
|00000ae0| 20 59 6f 75 20 63 61 6e | 20 73 70 65 63 69 66 79 | You can| specify|
|00000af0| 20 75 70 20 74 6f 20 66 | 6f 75 72 20 6c 69 6e 65 | up to f|our line|
|00000b00| 20 67 72 6f 75 70 20 66 | 6f 72 6d 61 74 73 2c 20 | group f|ormats, |
|00000b10| 6f 6e 65 20 66 6f 72 0a | 65 61 63 68 20 6b 69 6e |one for.|each kin|
|00000b20| 64 20 6f 66 20 6c 69 6e | 65 20 67 72 6f 75 70 2e |d of lin|e group.|
|00000b30| 20 20 59 6f 75 20 73 68 | 6f 75 6c 64 20 71 75 6f | You sh|ould quo|
|00000b40| 74 65 20 46 4f 52 4d 41 | 54 2c 20 62 65 63 61 75 |te FORMA|T, becau|
|00000b50| 73 65 20 69 74 20 74 79 | 70 69 63 61 6c 6c 79 0a |se it ty|pically.|
|00000b60| 63 6f 6e 74 61 69 6e 73 | 20 73 68 65 6c 6c 20 6d |contains| shell m|
|00000b70| 65 74 61 63 68 61 72 61 | 63 74 65 72 73 2e 0a 0a |etachara|cters...|
|00000b80| 60 2d 2d 6f 6c 64 2d 67 | 72 6f 75 70 2d 66 6f 72 |`--old-g|roup-for|
|00000b90| 6d 61 74 3d 46 4f 52 4d | 41 54 27 0a 20 20 20 20 |mat=FORM|AT'. |
|00000ba0| 20 54 68 65 73 65 20 6c | 69 6e 65 20 67 72 6f 75 | These l|ine grou|
|00000bb0| 70 73 20 61 72 65 20 68 | 75 6e 6b 73 20 63 6f 6e |ps are h|unks con|
|00000bc0| 74 61 69 6e 69 6e 67 20 | 6f 6e 6c 79 20 6c 69 6e |taining |only lin|
|00000bd0| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 66 69 72 73 |es from |the firs|
|00000be0| 74 0a 20 20 20 20 20 66 | 69 6c 65 2e 20 20 54 68 |t. f|ile. Th|
|00000bf0| 65 20 64 65 66 61 75 6c | 74 20 6f 6c 64 20 67 72 |e defaul|t old gr|
|00000c00| 6f 75 70 20 66 6f 72 6d | 61 74 20 69 73 20 74 68 |oup form|at is th|
|00000c10| 65 20 73 61 6d 65 20 61 | 73 20 74 68 65 20 63 68 |e same a|s the ch|
|00000c20| 61 6e 67 65 64 0a 20 20 | 20 20 20 67 72 6f 75 70 |anged. | group|
|00000c30| 20 66 6f 72 6d 61 74 20 | 69 66 20 69 74 20 69 73 | format |if it is|
|00000c40| 20 73 70 65 63 69 66 69 | 65 64 3b 20 6f 74 68 65 | specifi|ed; othe|
|00000c50| 72 77 69 73 65 20 69 74 | 20 69 73 20 61 20 66 6f |rwise it| is a fo|
|00000c60| 72 6d 61 74 20 74 68 61 | 74 0a 20 20 20 20 20 6f |rmat tha|t. o|
|00000c70| 75 74 70 75 74 73 20 74 | 68 65 20 6c 69 6e 65 20 |utputs t|he line |
|00000c80| 67 72 6f 75 70 20 61 73 | 2d 69 73 2e 0a 0a 60 2d |group as|-is...`-|
|00000c90| 2d 6e 65 77 2d 67 72 6f | 75 70 2d 66 6f 72 6d 61 |-new-gro|up-forma|
|00000ca0| 74 3d 46 4f 52 4d 41 54 | 27 0a 20 20 20 20 20 54 |t=FORMAT|'. T|
|00000cb0| 68 65 73 65 20 6c 69 6e | 65 20 67 72 6f 75 70 73 |hese lin|e groups|
|00000cc0| 20 61 72 65 20 68 75 6e | 6b 73 20 63 6f 6e 74 61 | are hun|ks conta|
|00000cd0| 69 6e 69 6e 67 20 6f 6e | 6c 79 20 6c 69 6e 65 73 |ining on|ly lines|
|00000ce0| 20 66 72 6f 6d 20 74 68 | 65 20 73 65 63 6f 6e 64 | from th|e second|
|00000cf0| 0a 20 20 20 20 20 66 69 | 6c 65 2e 20 20 54 68 65 |. fi|le. The|
|00000d00| 20 64 65 66 61 75 6c 74 | 20 6e 65 77 20 67 72 6f | default| new gro|
|00000d10| 75 70 20 66 6f 72 6d 61 | 74 20 69 73 20 73 61 6d |up forma|t is sam|
|00000d20| 65 20 61 73 20 74 68 65 | 20 74 68 65 20 63 68 61 |e as the| the cha|
|00000d30| 6e 67 65 64 0a 20 20 20 | 20 20 67 72 6f 75 70 20 |nged. | group |
|00000d40| 66 6f 72 6d 61 74 20 69 | 66 20 69 74 20 69 73 20 |format i|f it is |
|00000d50| 73 70 65 63 69 66 69 65 | 64 3b 20 6f 74 68 65 72 |specifie|d; other|
|00000d60| 77 69 73 65 20 69 74 20 | 69 73 20 61 20 66 6f 72 |wise it |is a for|
|00000d70| 6d 61 74 20 74 68 61 74 | 0a 20 20 20 20 20 6f 75 |mat that|. ou|
|00000d80| 74 70 75 74 73 20 74 68 | 65 20 6c 69 6e 65 20 67 |tputs th|e line g|
|00000d90| 72 6f 75 70 20 61 73 2d | 69 73 2e 0a 0a 60 2d 2d |roup as-|is...`--|
|00000da0| 63 68 61 6e 67 65 64 2d | 67 72 6f 75 70 2d 66 6f |changed-|group-fo|
|00000db0| 72 6d 61 74 3d 46 4f 52 | 4d 41 54 27 0a 20 20 20 |rmat=FOR|MAT'. |
|00000dc0| 20 20 54 68 65 73 65 20 | 6c 69 6e 65 20 67 72 6f | These |line gro|
|00000dd0| 75 70 73 20 61 72 65 20 | 68 75 6e 6b 73 20 63 6f |ups are |hunks co|
|00000de0| 6e 74 61 69 6e 69 6e 67 | 20 6c 69 6e 65 73 20 66 |ntaining| lines f|
|00000df0| 72 6f 6d 20 62 6f 74 68 | 20 66 69 6c 65 73 2e 20 |rom both| files. |
|00000e00| 20 54 68 65 0a 20 20 20 | 20 20 64 65 66 61 75 6c | The. | defaul|
|00000e10| 74 20 63 68 61 6e 67 65 | 64 20 67 72 6f 75 70 20 |t change|d group |
|00000e20| 66 6f 72 6d 61 74 20 69 | 73 20 74 68 65 20 63 6f |format i|s the co|
|00000e30| 6e 63 61 74 65 6e 61 74 | 69 6f 6e 20 6f 66 20 74 |ncatenat|ion of t|
|00000e40| 68 65 20 6f 6c 64 20 61 | 6e 64 0a 20 20 20 20 20 |he old a|nd. |
|00000e50| 6e 65 77 20 67 72 6f 75 | 70 20 66 6f 72 6d 61 74 |new grou|p format|
|00000e60| 73 2e 0a 0a 60 2d 2d 75 | 6e 63 68 61 6e 67 65 64 |s...`--u|nchanged|
|00000e70| 2d 67 72 6f 75 70 2d 66 | 6f 72 6d 61 74 3d 46 4f |-group-f|ormat=FO|
|00000e80| 52 4d 41 54 27 0a 20 20 | 20 20 20 54 68 65 73 65 |RMAT'. | These|
|00000e90| 20 6c 69 6e 65 20 67 72 | 6f 75 70 73 20 63 6f 6e | line gr|oups con|
|00000ea0| 74 61 69 6e 20 6c 69 6e | 65 73 20 63 6f 6d 6d 6f |tain lin|es commo|
|00000eb0| 6e 20 74 6f 20 62 6f 74 | 68 20 66 69 6c 65 73 2e |n to bot|h files.|
|00000ec0| 20 20 54 68 65 20 64 65 | 66 61 75 6c 74 0a 20 20 | The de|fault. |
|00000ed0| 20 20 20 75 6e 63 68 61 | 6e 67 65 64 20 67 72 6f | uncha|nged gro|
|00000ee0| 75 70 20 66 6f 72 6d 61 | 74 20 69 73 20 61 20 66 |up forma|t is a f|
|00000ef0| 6f 72 6d 61 74 20 74 68 | 61 74 20 6f 75 74 70 75 |ormat th|at outpu|
|00000f00| 74 73 20 74 68 65 20 6c | 69 6e 65 20 67 72 6f 75 |ts the l|ine grou|
|00000f10| 70 0a 20 20 20 20 20 61 | 73 2d 69 73 2e 0a 0a 20 |p. a|s-is... |
|00000f20| 20 20 49 6e 20 61 20 6c | 69 6e 65 20 67 72 6f 75 | In a l|ine grou|
|00000f30| 70 20 66 6f 72 6d 61 74 | 2c 20 6f 72 64 69 6e 61 |p format|, ordina|
|00000f40| 72 79 20 63 68 61 72 61 | 63 74 65 72 73 20 72 65 |ry chara|cters re|
|00000f50| 70 72 65 73 65 6e 74 20 | 74 68 65 6d 73 65 6c 76 |present |themselv|
|00000f60| 65 73 3b 0a 63 6f 6e 76 | 65 72 73 69 6f 6e 20 73 |es;.conv|ersion s|
|00000f70| 70 65 63 69 66 69 63 61 | 74 69 6f 6e 73 20 73 74 |pecifica|tions st|
|00000f80| 61 72 74 20 77 69 74 68 | 20 60 25 27 20 61 6e 64 |art with| `%' and|
|00000f90| 20 68 61 76 65 20 6f 6e | 65 20 6f 66 20 74 68 65 | have on|e of the|
|00000fa0| 20 66 6f 6c 6c 6f 77 69 | 6e 67 0a 66 6f 72 6d 73 | followi|ng.forms|
|00000fb0| 2e 0a 0a 60 25 3c 27 0a | 20 20 20 20 20 73 74 61 |...`%<'.| sta|
|00000fc0| 6e 64 73 20 66 6f 72 20 | 74 68 65 20 6c 69 6e 65 |nds for |the line|
|00000fd0| 73 20 66 72 6f 6d 20 74 | 68 65 20 66 69 72 73 74 |s from t|he first|
|00000fe0| 20 66 69 6c 65 2c 20 69 | 6e 63 6c 75 64 69 6e 67 | file, i|ncluding|
|00000ff0| 20 74 68 65 20 74 72 61 | 69 6c 69 6e 67 0a 20 20 | the tra|iling. |
|00001000| 20 20 20 6e 65 77 6c 69 | 6e 65 2e 20 20 45 61 63 | newli|ne. Eac|
|00001010| 68 20 6c 69 6e 65 20 69 | 73 20 66 6f 72 6d 61 74 |h line i|s format|
|00001020| 74 65 64 20 61 63 63 6f | 72 64 69 6e 67 20 74 6f |ted acco|rding to|
|00001030| 20 74 68 65 20 6f 6c 64 | 20 6c 69 6e 65 20 66 6f | the old| line fo|
|00001040| 72 6d 61 74 0a 20 20 20 | 20 20 28 2a 6e 6f 74 65 |rmat. | (*note|
|00001050| 20 4c 69 6e 65 20 46 6f | 72 6d 61 74 73 3a 3a 2e | Line Fo|rmats::.|
|00001060| 29 2e 0a 0a 60 25 3e 27 | 0a 20 20 20 20 20 73 74 |)...`%>'|. st|
|00001070| 61 6e 64 73 20 66 6f 72 | 20 74 68 65 20 6c 69 6e |ands for| the lin|
|00001080| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 73 65 63 6f |es from |the seco|
|00001090| 6e 64 20 66 69 6c 65 2c | 20 69 6e 63 6c 75 64 69 |nd file,| includi|
|000010a0| 6e 67 20 74 68 65 20 74 | 72 61 69 6c 69 6e 67 0a |ng the t|railing.|
|000010b0| 20 20 20 20 20 6e 65 77 | 6c 69 6e 65 2e 20 20 45 | new|line. E|
|000010c0| 61 63 68 20 6c 69 6e 65 | 20 69 73 20 66 6f 72 6d |ach line| is form|
|000010d0| 61 74 74 65 64 20 61 63 | 63 6f 72 64 69 6e 67 20 |atted ac|cording |
|000010e0| 74 6f 20 74 68 65 20 6e | 65 77 20 6c 69 6e 65 20 |to the n|ew line |
|000010f0| 66 6f 72 6d 61 74 2e 0a | 0a 60 25 3d 27 0a 20 20 |format..|.`%='. |
|00001100| 20 20 20 73 74 61 6e 64 | 73 20 66 6f 72 20 74 68 | stand|s for th|
|00001110| 65 20 6c 69 6e 65 73 20 | 63 6f 6d 6d 6f 6e 20 74 |e lines |common t|
|00001120| 6f 20 62 6f 74 68 20 66 | 69 6c 65 73 2c 20 69 6e |o both f|iles, in|
|00001130| 63 6c 75 64 69 6e 67 20 | 74 68 65 20 74 72 61 69 |cluding |the trai|
|00001140| 6c 69 6e 67 0a 20 20 20 | 20 20 6e 65 77 6c 69 6e |ling. | newlin|
|00001150| 65 2e 20 20 45 61 63 68 | 20 6c 69 6e 65 20 69 73 |e. Each| line is|
|00001160| 20 66 6f 72 6d 61 74 74 | 65 64 20 61 63 63 6f 72 | formatt|ed accor|
|00001170| 64 69 6e 67 20 74 6f 20 | 74 68 65 20 75 6e 63 68 |ding to |the unch|
|00001180| 61 6e 67 65 64 20 6c 69 | 6e 65 0a 20 20 20 20 20 |anged li|ne. |
|00001190| 66 6f 72 6d 61 74 2e 0a | 0a 60 25 25 27 0a 20 20 |format..|.`%%'. |
|000011a0| 20 20 20 73 74 61 6e 64 | 73 20 66 6f 72 20 60 25 | stand|s for `%|
|000011b0| 27 2e 0a 0a 60 25 63 27 | 43 27 27 0a 20 20 20 20 |'...`%c'|C''. |
|000011c0| 20 77 68 65 72 65 20 43 | 20 69 73 20 61 20 73 69 | where C| is a si|
|000011d0| 6e 67 6c 65 20 63 68 61 | 72 61 63 74 65 72 2c 20 |ngle cha|racter, |
|000011e0| 73 74 61 6e 64 73 20 66 | 6f 72 20 43 2e 20 20 43 |stands f|or C. C|
|000011f0| 20 6d 61 79 20 6e 6f 74 | 20 62 65 20 61 0a 20 20 | may not| be a. |
|00001200| 20 20 20 62 61 63 6b 73 | 6c 61 73 68 20 6f 72 20 | backs|lash or |
|00001210| 61 6e 20 61 70 6f 73 74 | 72 6f 70 68 65 2e 20 20 |an apost|rophe. |
|00001220| 46 6f 72 20 65 78 61 6d | 70 6c 65 2c 20 60 25 63 |For exam|ple, `%c|
|00001230| 27 3a 27 27 20 73 74 61 | 6e 64 73 20 66 6f 72 20 |':'' sta|nds for |
|00001240| 61 0a 20 20 20 20 20 63 | 6f 6c 6f 6e 2c 20 65 76 |a. c|olon, ev|
|00001250| 65 6e 20 69 6e 73 69 64 | 65 20 74 68 65 20 74 68 |en insid|e the th|
|00001260| 65 6e 2d 70 61 72 74 20 | 6f 66 20 61 6e 20 69 66 |en-part |of an if|
|00001270| 2d 74 68 65 6e 2d 65 6c | 73 65 20 66 6f 72 6d 61 |-then-el|se forma|
|00001280| 74 2c 20 77 68 69 63 68 | 0a 20 20 20 20 20 61 20 |t, which|. a |
|00001290| 63 6f 6c 6f 6e 20 77 6f | 75 6c 64 20 6e 6f 72 6d |colon wo|uld norm|
|000012a0| 61 6c 6c 79 20 74 65 72 | 6d 69 6e 61 74 65 2e 0a |ally ter|minate..|
|000012b0| 0a 60 25 63 27 5c 4f 27 | 27 0a 20 20 20 20 20 77 |.`%c'\O'|'. w|
|000012c0| 68 65 72 65 20 4f 20 69 | 73 20 61 20 73 74 72 69 |here O i|s a stri|
|000012d0| 6e 67 20 6f 66 20 31 2c | 20 32 2c 20 6f 72 20 33 |ng of 1,| 2, or 3|
|000012e0| 20 6f 63 74 61 6c 20 64 | 69 67 69 74 73 2c 20 73 | octal d|igits, s|
|000012f0| 74 61 6e 64 73 20 66 6f | 72 20 74 68 65 0a 20 20 |tands fo|r the. |
|00001300| 20 20 20 63 68 61 72 61 | 63 74 65 72 20 77 69 74 | chara|cter wit|
|00001310| 68 20 6f 63 74 61 6c 20 | 63 6f 64 65 20 4f 2e 20 |h octal |code O. |
|00001320| 20 46 6f 72 20 65 78 61 | 6d 70 6c 65 2c 20 60 25 | For exa|mple, `%|
|00001330| 63 27 5c 30 27 27 20 73 | 74 61 6e 64 73 20 66 6f |c'\0'' s|tands fo|
|00001340| 72 20 61 0a 20 20 20 20 | 20 6e 75 6c 6c 20 63 68 |r a. | null ch|
|00001350| 61 72 61 63 74 65 72 2e | 0a 0a 60 46 4e 27 0a 20 |aracter.|..`FN'. |
|00001360| 20 20 20 20 77 68 65 72 | 65 20 46 20 69 73 20 61 | wher|e F is a|
|00001370| 20 60 70 72 69 6e 74 66 | 27 20 63 6f 6e 76 65 72 | `printf|' conver|
|00001380| 73 69 6f 6e 20 73 70 65 | 63 69 66 69 63 61 74 69 |sion spe|cificati|
|00001390| 6f 6e 20 61 6e 64 20 4e | 20 69 73 20 6f 6e 65 20 |on and N| is one |
|000013a0| 6f 66 20 74 68 65 0a 20 | 20 20 20 20 66 6f 6c 6c |of the. | foll|
|000013b0| 6f 77 69 6e 67 20 6c 65 | 74 74 65 72 73 2c 20 73 |owing le|tters, s|
|000013c0| 74 61 6e 64 73 20 66 6f | 72 20 4e 27 73 20 76 61 |tands fo|r N's va|
|000013d0| 6c 75 65 20 66 6f 72 6d | 61 74 74 65 64 20 77 69 |lue form|atted wi|
|000013e0| 74 68 20 46 2e 0a 0a 20 | 20 20 20 60 65 27 0a 20 |th F... | `e'. |
|000013f0| 20 20 20 20 20 20 20 20 | 20 54 68 65 20 6c 69 6e | | The lin|
|00001400| 65 20 6e 75 6d 62 65 72 | 20 6f 66 20 74 68 65 20 |e number| of the |
|00001410| 6c 69 6e 65 20 6a 75 73 | 74 20 62 65 66 6f 72 65 |line jus|t before|
|00001420| 20 74 68 65 20 67 72 6f | 75 70 20 69 6e 20 74 68 | the gro|up in th|
|00001430| 65 20 6f 6c 64 0a 20 20 | 20 20 20 20 20 20 20 20 |e old. | |
|00001440| 66 69 6c 65 2e 0a 0a 20 | 20 20 20 60 66 27 0a 20 |file... | `f'. |
|00001450| 20 20 20 20 20 20 20 20 | 20 54 68 65 20 6c 69 6e | | The lin|
|00001460| 65 20 6e 75 6d 62 65 72 | 20 6f 66 20 74 68 65 20 |e number| of the |
|00001470| 66 69 72 73 74 20 6c 69 | 6e 65 20 69 6e 20 74 68 |first li|ne in th|
|00001480| 65 20 67 72 6f 75 70 20 | 69 6e 20 74 68 65 20 6f |e group |in the o|
|00001490| 6c 64 0a 20 20 20 20 20 | 20 20 20 20 20 66 69 6c |ld. | fil|
|000014a0| 65 3b 20 65 71 75 61 6c | 73 20 45 20 2b 20 31 2e |e; equal|s E + 1.|
|000014b0| 0a 0a 20 20 20 20 60 6c | 27 0a 20 20 20 20 20 20 |.. `l|'. |
|000014c0| 20 20 20 20 54 68 65 20 | 6c 69 6e 65 20 6e 75 6d | The |line num|
|000014d0| 62 65 72 20 6f 66 20 74 | 68 65 20 6c 61 73 74 20 |ber of t|he last |
|000014e0| 6c 69 6e 65 20 69 6e 20 | 74 68 65 20 67 72 6f 75 |line in |the grou|
|000014f0| 70 20 69 6e 20 74 68 65 | 20 6f 6c 64 20 66 69 6c |p in the| old fil|
|00001500| 65 2e 0a 0a 20 20 20 20 | 60 6d 27 0a 20 20 20 20 |e... |`m'. |
|00001510| 20 20 20 20 20 20 54 68 | 65 20 6c 69 6e 65 20 6e | Th|e line n|
|00001520| 75 6d 62 65 72 20 6f 66 | 20 74 68 65 20 6c 69 6e |umber of| the lin|
|00001530| 65 20 6a 75 73 74 20 61 | 66 74 65 72 20 74 68 65 |e just a|fter the|
|00001540| 20 67 72 6f 75 70 20 69 | 6e 20 74 68 65 20 6f 6c | group i|n the ol|
|00001550| 64 0a 20 20 20 20 20 20 | 20 20 20 20 66 69 6c 65 |d. | file|
|00001560| 3b 20 65 71 75 61 6c 73 | 20 4c 20 2b 20 31 2e 0a |; equals| L + 1..|
|00001570| 0a 20 20 20 20 60 6e 27 | 0a 20 20 20 20 20 20 20 |. `n'|. |
|00001580| 20 20 20 54 68 65 20 6e | 75 6d 62 65 72 20 6f 66 | The n|umber of|
|00001590| 20 6c 69 6e 65 73 20 69 | 6e 20 74 68 65 20 67 72 | lines i|n the gr|
|000015a0| 6f 75 70 20 69 6e 20 74 | 68 65 20 6f 6c 64 20 66 |oup in t|he old f|
|000015b0| 69 6c 65 3b 20 65 71 75 | 61 6c 73 20 4c 20 2d 0a |ile; equ|als L -.|
|000015c0| 20 20 20 20 20 20 20 20 | 20 20 46 20 2b 20 31 2e | | F + 1.|
|000015d0| 0a 0a 20 20 20 20 60 45 | 2c 20 46 2c 20 4c 2c 20 |.. `E|, F, L, |
|000015e0| 4d 2c 20 4e 27 0a 20 20 | 20 20 20 20 20 20 20 20 |M, N'. | |
|000015f0| 4c 69 6b 65 77 69 73 65 | 2c 20 66 6f 72 20 6c 69 |Likewise|, for li|
|00001600| 6e 65 73 20 69 6e 20 74 | 68 65 20 6e 65 77 20 66 |nes in t|he new f|
|00001610| 69 6c 65 2e 0a 0a 20 20 | 20 20 20 54 68 65 20 60 |ile... | The `|
|00001620| 70 72 69 6e 74 66 27 20 | 63 6f 6e 76 65 72 73 69 |printf' |conversi|
|00001630| 6f 6e 20 73 70 65 63 69 | 66 69 63 61 74 69 6f 6e |on speci|fication|
|00001640| 20 63 61 6e 20 62 65 20 | 60 25 64 27 2c 20 60 25 | can be |`%d', `%|
|00001650| 6f 27 2c 20 60 25 78 27 | 2c 20 6f 72 0a 20 20 20 |o', `%x'|, or. |
|00001660| 20 20 60 25 58 27 2c 20 | 73 70 65 63 69 66 79 69 | `%X', |specifyi|
|00001670| 6e 67 20 64 65 63 69 6d | 61 6c 2c 20 6f 63 74 61 |ng decim|al, octa|
|00001680| 6c 2c 20 6c 6f 77 65 72 | 20 63 61 73 65 20 68 65 |l, lower| case he|
|00001690| 78 61 64 65 63 69 6d 61 | 6c 2c 20 6f 72 20 75 70 |xadecima|l, or up|
|000016a0| 70 65 72 0a 20 20 20 20 | 20 63 61 73 65 20 68 65 |per. | case he|
|000016b0| 78 61 64 65 63 69 6d 61 | 6c 20 6f 75 74 70 75 74 |xadecima|l output|
|000016c0| 20 72 65 73 70 65 63 74 | 69 76 65 6c 79 2e 20 20 | respect|ively. |
|000016d0| 41 66 74 65 72 20 74 68 | 65 20 60 25 27 20 74 68 |After th|e `%' th|
|000016e0| 65 20 66 6f 6c 6c 6f 77 | 69 6e 67 0a 20 20 20 20 |e follow|ing. |
|000016f0| 20 6f 70 74 69 6f 6e 73 | 20 63 61 6e 20 61 70 70 | options| can app|
|00001700| 65 61 72 20 69 6e 20 73 | 65 71 75 65 6e 63 65 3a |ear in s|equence:|
|00001710| 20 61 20 60 2d 27 20 73 | 70 65 63 69 66 79 69 6e | a `-' s|pecifyin|
|00001720| 67 0a 20 20 20 20 20 6c | 65 66 74 2d 6a 75 73 74 |g. l|eft-just|
|00001730| 69 66 69 63 61 74 69 6f | 6e 3b 20 61 6e 20 69 6e |ificatio|n; an in|
|00001740| 74 65 67 65 72 20 73 70 | 65 63 69 66 79 69 6e 67 |teger sp|ecifying|
|00001750| 20 74 68 65 20 6d 69 6e | 69 6d 75 6d 20 66 69 65 | the min|imum fie|
|00001760| 6c 64 20 77 69 64 74 68 | 3b 0a 20 20 20 20 20 61 |ld width|;. a|
|00001770| 6e 64 20 61 20 70 65 72 | 69 6f 64 20 66 6f 6c 6c |nd a per|iod foll|
|00001780| 6f 77 65 64 20 62 79 20 | 61 6e 20 6f 70 74 69 6f |owed by |an optio|
|00001790| 6e 61 6c 20 69 6e 74 65 | 67 65 72 20 73 70 65 63 |nal inte|ger spec|
|000017a0| 69 66 79 69 6e 67 20 74 | 68 65 0a 20 20 20 20 20 |ifying t|he. |
|000017b0| 6d 69 6e 69 6d 75 6d 20 | 6e 75 6d 62 65 72 20 6f |minimum |number o|
|000017c0| 66 20 64 69 67 69 74 73 | 2e 20 20 46 6f 72 20 65 |f digits|. For e|
|000017d0| 78 61 6d 70 6c 65 2c 20 | 60 25 35 64 4e 27 20 70 |xample, |`%5dN' p|
|000017e0| 72 69 6e 74 73 20 74 68 | 65 20 6e 75 6d 62 65 72 |rints th|e number|
|000017f0| 0a 20 20 20 20 20 6f 66 | 20 6e 65 77 20 6c 69 6e |. of| new lin|
|00001800| 65 73 20 69 6e 20 74 68 | 65 20 67 72 6f 75 70 20 |es in th|e group |
|00001810| 69 6e 20 61 20 66 69 65 | 6c 64 20 6f 66 20 77 69 |in a fie|ld of wi|
|00001820| 64 74 68 20 35 20 63 68 | 61 72 61 63 74 65 72 73 |dth 5 ch|aracters|
|00001830| 2c 20 75 73 69 6e 67 0a | 20 20 20 20 20 74 68 65 |, using.| the|
|00001840| 20 60 70 72 69 6e 74 66 | 27 20 66 6f 72 6d 61 74 | `printf|' format|
|00001850| 20 60 22 25 35 64 22 27 | 2e 0a 0a 60 28 41 3d 42 | `"%5d"'|...`(A=B|
|00001860| 3f 54 3a 45 29 27 0a 20 | 20 20 20 20 49 66 20 41 |?T:E)'. | If A|
|00001870| 20 65 71 75 61 6c 73 20 | 42 20 74 68 65 6e 20 54 | equals |B then T|
|00001880| 20 65 6c 73 65 20 45 2e | 20 20 41 20 61 6e 64 20 | else E.| A and |
|00001890| 42 20 61 72 65 20 65 61 | 63 68 20 65 69 74 68 65 |B are ea|ch eithe|
|000018a0| 72 20 61 20 64 65 63 69 | 6d 61 6c 0a 20 20 20 20 |r a deci|mal. |
|000018b0| 20 63 6f 6e 73 74 61 6e | 74 20 6f 72 20 61 20 73 | constan|t or a s|
|000018c0| 69 6e 67 6c 65 20 6c 65 | 74 74 65 72 20 69 6e 74 |ingle le|tter int|
|000018d0| 65 72 70 72 65 74 65 64 | 20 61 73 20 61 62 6f 76 |erpreted| as abov|
|000018e0| 65 2e 20 20 54 68 69 73 | 20 66 6f 72 6d 61 74 0a |e. This| format.|
|000018f0| 20 20 20 20 20 73 70 65 | 63 20 69 73 20 65 71 75 | spe|c is equ|
|00001900| 69 76 61 6c 65 6e 74 20 | 74 6f 20 54 20 69 66 20 |ivalent |to T if |
|00001910| 41 27 73 20 76 61 6c 75 | 65 20 65 71 75 61 6c 73 |A's valu|e equals|
|00001920| 20 42 27 73 3b 20 6f 74 | 68 65 72 77 69 73 65 20 | B's; ot|herwise |
|00001930| 69 74 20 69 73 0a 20 20 | 20 20 20 65 71 75 69 76 |it is. | equiv|
|00001940| 61 6c 65 6e 74 20 74 6f | 20 45 2e 0a 0a 20 20 20 |alent to| E... |
|00001950| 20 20 46 6f 72 20 65 78 | 61 6d 70 6c 65 2c 20 60 | For ex|ample, `|
|00001960| 25 28 4e 3d 30 3f 6e 6f | 3a 25 64 4e 29 20 6c 69 |%(N=0?no|:%dN) li|
|00001970| 6e 65 25 28 4e 3d 31 3f | 3a 73 29 27 20 69 73 20 |ne%(N=1?|:s)' is |
|00001980| 65 71 75 69 76 61 6c 65 | 6e 74 20 74 6f 20 60 6e |equivale|nt to `n|
|00001990| 6f 0a 20 20 20 20 20 6c | 69 6e 65 73 27 20 69 66 |o. l|ines' if|
|000019a0| 20 4e 20 28 74 68 65 20 | 6e 75 6d 62 65 72 20 6f | N (the |number o|
|000019b0| 66 20 6c 69 6e 65 73 20 | 69 6e 20 74 68 65 20 67 |f lines |in the g|
|000019c0| 72 6f 75 70 20 69 6e 20 | 74 68 65 20 74 68 65 20 |roup in |the the |
|000019d0| 6e 65 77 20 66 69 6c 65 | 29 0a 20 20 20 20 20 69 |new file|). i|
|000019e0| 73 20 30 2c 20 74 6f 20 | 60 31 20 6c 69 6e 65 27 |s 0, to |`1 line'|
|000019f0| 20 69 66 20 4e 20 69 73 | 20 31 2c 20 61 6e 64 20 | if N is| 1, and |
|00001a00| 74 6f 20 60 25 64 4e 20 | 6c 69 6e 65 73 27 20 6f |to `%dN |lines' o|
|00001a10| 74 68 65 72 77 69 73 65 | 2e 0a 0a 1f 0a 46 69 6c |therwise|.....Fil|
|00001a20| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|00001a30| 6f 64 65 3a 20 4c 69 6e | 65 20 46 6f 72 6d 61 74 |ode: Lin|e Format|
|00001a40| 73 2c 20 20 4e 65 78 74 | 3a 20 44 65 74 61 69 6c |s, Next|: Detail|
|00001a50| 65 64 20 49 66 2d 74 68 | 65 6e 2d 65 6c 73 65 2c |ed If-th|en-else,|
|00001a60| 20 20 50 72 65 76 3a 20 | 4c 69 6e 65 20 47 72 6f | Prev: |Line Gro|
|00001a70| 75 70 20 46 6f 72 6d 61 | 74 73 2c 20 20 55 70 3a |up Forma|ts, Up:|
|00001a80| 20 49 66 2d 74 68 65 6e | 2d 65 6c 73 65 0a 0a 4c | If-then|-else..L|
|00001a90| 69 6e 65 20 46 6f 72 6d | 61 74 73 0a 2d 2d 2d 2d |ine Form|ats.----|
|00001aa0| 2d 2d 2d 2d 2d 2d 2d 2d | 0a 0a 20 20 20 4c 69 6e |--------|.. Lin|
|00001ab0| 65 20 66 6f 72 6d 61 74 | 73 20 63 6f 6e 74 72 6f |e format|s contro|
|00001ac0| 6c 20 68 6f 77 20 65 61 | 63 68 20 6c 69 6e 65 20 |l how ea|ch line |
|00001ad0| 74 61 6b 65 6e 20 66 72 | 6f 6d 20 61 6e 20 69 6e |taken fr|om an in|
|00001ae0| 70 75 74 20 66 69 6c 65 | 20 69 73 0a 6f 75 74 70 |put file| is.outp|
|00001af0| 75 74 20 61 73 20 70 61 | 72 74 20 6f 66 20 61 20 |ut as pa|rt of a |
|00001b00| 6c 69 6e 65 20 67 72 6f | 75 70 20 69 6e 20 69 66 |line gro|up in if|
|00001b10| 2d 74 68 65 6e 2d 65 6c | 73 65 20 66 6f 72 6d 61 |-then-el|se forma|
|00001b20| 74 2e 0a 0a 20 20 20 46 | 6f 72 20 65 78 61 6d 70 |t... F|or examp|
|00001b30| 6c 65 2c 20 74 68 65 20 | 66 6f 6c 6c 6f 77 69 6e |le, the |followin|
|00001b40| 67 20 63 6f 6d 6d 61 6e | 64 20 6f 75 74 70 75 74 |g comman|d output|
|00001b50| 73 20 74 65 78 74 20 77 | 69 74 68 20 61 20 6f 6e |s text w|ith a on|
|00001b60| 65 2d 63 6f 6c 75 6d 6e | 0a 63 68 61 6e 67 65 20 |e-column|.change |
|00001b70| 69 6e 64 69 63 61 74 6f | 72 20 74 6f 20 74 68 65 |indicato|r to the|
|00001b80| 20 6c 65 66 74 20 6f 66 | 20 74 68 65 20 74 65 78 | left of| the tex|
|00001b90| 74 2e 20 20 54 68 65 20 | 66 69 72 73 74 20 63 6f |t. The |first co|
|00001ba0| 6c 75 6d 6e 20 6f 66 20 | 6f 75 74 70 75 74 0a 69 |lumn of |output.i|
|00001bb0| 73 20 60 2d 27 20 66 6f | 72 20 64 65 6c 65 74 65 |s `-' fo|r delete|
|00001bc0| 64 20 6c 69 6e 65 73 2c | 20 60 7c 27 20 66 6f 72 |d lines,| `|' for|
|00001bd0| 20 61 64 64 65 64 20 6c | 69 6e 65 73 2c 20 61 6e | added l|ines, an|
|00001be0| 64 20 61 20 73 70 61 63 | 65 20 66 6f 72 0a 75 6e |d a spac|e for.un|
|00001bf0| 63 68 61 6e 67 65 64 20 | 6c 69 6e 65 73 2e 20 20 |changed |lines. |
|00001c00| 54 68 65 20 66 6f 72 6d | 61 74 73 20 63 6f 6e 74 |The form|ats cont|
|00001c10| 61 69 6e 20 6e 65 77 6c | 69 6e 65 20 63 68 61 72 |ain newl|ine char|
|00001c20| 61 63 74 65 72 73 20 77 | 68 65 72 65 20 6e 65 77 |acters w|here new|
|00001c30| 6c 69 6e 65 73 0a 61 72 | 65 20 64 65 73 69 72 65 |lines.ar|e desire|
|00001c40| 64 20 6f 6e 20 6f 75 74 | 70 75 74 2e 0a 0a 20 20 |d on out|put... |
|00001c50| 20 20 20 64 69 66 66 20 | 5c 0a 20 20 20 20 20 20 | diff |\. |
|00001c60| 20 20 2d 2d 6f 6c 64 2d | 6c 69 6e 65 2d 66 6f 72 | --old-|line-for|
|00001c70| 6d 61 74 3d 27 2d 25 6c | 0a 20 20 20 20 20 27 20 |mat='-%l|. ' |
|00001c80| 5c 0a 20 20 20 20 20 20 | 20 20 2d 2d 6e 65 77 2d |\. | --new-|
|00001c90| 6c 69 6e 65 2d 66 6f 72 | 6d 61 74 3d 27 7c 25 6c |line-for|mat='|%l|
|00001ca0| 0a 20 20 20 20 20 27 20 | 5c 0a 20 20 20 20 20 20 |. ' |\. |
|00001cb0| 20 20 2d 2d 75 6e 63 68 | 61 6e 67 65 64 2d 6c 69 | --unch|anged-li|
|00001cc0| 6e 65 2d 66 6f 72 6d 61 | 74 3d 27 20 25 6c 0a 20 |ne-forma|t=' %l. |
|00001cd0| 20 20 20 20 27 20 5c 0a | 20 20 20 20 20 20 20 20 | ' \.| |
|00001ce0| 6f 6c 64 20 6e 65 77 0a | 0a 20 20 20 54 6f 20 73 |old new.|. To s|
|00001cf0| 70 65 63 69 66 79 20 61 | 20 6c 69 6e 65 20 66 6f |pecify a| line fo|
|00001d00| 72 6d 61 74 2c 20 75 73 | 65 20 6f 6e 65 20 6f 66 |rmat, us|e one of|
|00001d10| 20 74 68 65 20 66 6f 6c | 6c 6f 77 69 6e 67 20 6f | the fol|lowing o|
|00001d20| 70 74 69 6f 6e 73 2e 20 | 20 59 6f 75 0a 73 68 6f |ptions. | You.sho|
|00001d30| 75 6c 64 20 71 75 6f 74 | 65 20 46 4f 52 4d 41 54 |uld quot|e FORMAT|
|00001d40| 2c 20 73 69 6e 63 65 20 | 69 74 20 6f 66 74 65 6e |, since |it often|
|00001d50| 20 63 6f 6e 74 61 69 6e | 73 20 73 68 65 6c 6c 20 | contain|s shell |
|00001d60| 6d 65 74 61 63 68 61 72 | 61 63 74 65 72 73 2e 0a |metachar|acters..|
|00001d70| 0a 60 2d 2d 6f 6c 64 2d | 6c 69 6e 65 2d 66 6f 72 |.`--old-|line-for|
|00001d80| 6d 61 74 3d 46 4f 52 4d | 41 54 27 0a 20 20 20 20 |mat=FORM|AT'. |
|00001d90| 20 66 6f 72 6d 61 74 73 | 20 6c 69 6e 65 73 20 6a | formats| lines j|
|00001da0| 75 73 74 20 66 72 6f 6d | 20 74 68 65 20 66 69 72 |ust from| the fir|
|00001db0| 73 74 20 66 69 6c 65 2e | 0a 0a 60 2d 2d 6e 65 77 |st file.|..`--new|
|00001dc0| 2d 6c 69 6e 65 2d 66 6f | 72 6d 61 74 3d 46 4f 52 |-line-fo|rmat=FOR|
|00001dd0| 4d 41 54 27 0a 20 20 20 | 20 20 66 6f 72 6d 61 74 |MAT'. | format|
|00001de0| 73 20 6c 69 6e 65 73 20 | 6a 75 73 74 20 66 72 6f |s lines |just fro|
|00001df0| 6d 20 74 68 65 20 73 65 | 63 6f 6e 64 20 66 69 6c |m the se|cond fil|
|00001e00| 65 2e 0a 0a 60 2d 2d 75 | 6e 63 68 61 6e 67 65 64 |e...`--u|nchanged|
|00001e10| 2d 6c 69 6e 65 2d 66 6f | 72 6d 61 74 3d 46 4f 52 |-line-fo|rmat=FOR|
|00001e20| 4d 41 54 27 0a 20 20 20 | 20 20 66 6f 72 6d 61 74 |MAT'. | format|
|00001e30| 73 20 6c 69 6e 65 73 20 | 63 6f 6d 6d 6f 6e 20 74 |s lines |common t|
|00001e40| 6f 20 62 6f 74 68 20 66 | 69 6c 65 73 2e 0a 0a 60 |o both f|iles...`|
|00001e50| 2d 2d 6c 69 6e 65 2d 66 | 6f 72 6d 61 74 3d 46 4f |--line-f|ormat=FO|
|00001e60| 52 4d 41 54 27 0a 20 20 | 20 20 20 66 6f 72 6d 61 |RMAT'. | forma|
|00001e70| 74 73 20 61 6c 6c 20 6c | 69 6e 65 73 3b 20 69 6e |ts all l|ines; in|
|00001e80| 20 65 66 66 65 63 74 2c | 20 69 74 20 73 65 74 73 | effect,| it sets|
|00001e90| 20 61 6c 6c 20 74 68 72 | 65 65 20 61 62 6f 76 65 | all thr|ee above|
|00001ea0| 20 6f 70 74 69 6f 6e 73 | 0a 20 20 20 20 20 73 69 | options|. si|
|00001eb0| 6d 75 6c 74 61 6e 65 6f | 75 73 6c 79 2e 0a 0a 20 |multaneo|usly... |
|00001ec0| 20 20 49 6e 20 61 20 6c | 69 6e 65 20 66 6f 72 6d | In a l|ine form|
|00001ed0| 61 74 2c 20 6f 72 64 69 | 6e 61 72 79 20 63 68 61 |at, ordi|nary cha|
|00001ee0| 72 61 63 74 65 72 73 20 | 72 65 70 72 65 73 65 6e |racters |represen|
|00001ef0| 74 20 74 68 65 6d 73 65 | 6c 76 65 73 3b 0a 63 6f |t themse|lves;.co|
|00001f00| 6e 76 65 72 73 69 6f 6e | 20 73 70 65 63 69 66 69 |nversion| specifi|
|00001f10| 63 61 74 69 6f 6e 73 20 | 73 74 61 72 74 20 77 69 |cations |start wi|
|00001f20| 74 68 20 60 25 27 20 61 | 6e 64 20 68 61 76 65 20 |th `%' a|nd have |
|00001f30| 6f 6e 65 20 6f 66 20 74 | 68 65 20 66 6f 6c 6c 6f |one of t|he follo|
|00001f40| 77 69 6e 67 0a 66 6f 72 | 6d 73 2e 0a 0a 60 25 6c |wing.for|ms...`%l|
|00001f50| 27 0a 20 20 20 20 20 73 | 74 61 6e 64 73 20 66 6f |'. s|tands fo|
|00001f60| 72 20 74 68 65 20 74 68 | 65 20 63 6f 6e 74 65 6e |r the th|e conten|
|00001f70| 74 73 20 6f 66 20 74 68 | 65 20 6c 69 6e 65 2c 20 |ts of th|e line, |
|00001f80| 6e 6f 74 20 63 6f 75 6e | 74 69 6e 67 20 69 74 73 |not coun|ting its|
|00001f90| 20 74 72 61 69 6c 69 6e | 67 0a 20 20 20 20 20 6e | trailin|g. n|
|00001fa0| 65 77 6c 69 6e 65 20 28 | 69 66 20 61 6e 79 29 2e |ewline (|if any).|
|00001fb0| 20 20 54 68 69 73 20 66 | 6f 72 6d 61 74 20 69 67 | This f|ormat ig|
|00001fc0| 6e 6f 72 65 73 20 77 68 | 65 74 68 65 72 20 74 68 |nores wh|ether th|
|00001fd0| 65 20 6c 69 6e 65 20 69 | 73 0a 20 20 20 20 20 69 |e line i|s. i|
|00001fe0| 6e 63 6f 6d 70 6c 65 74 | 65 3b 20 2a 4e 6f 74 65 |ncomplet|e; *Note|
|00001ff0| 20 49 6e 63 6f 6d 70 6c | 65 74 65 20 4c 69 6e 65 | Incompl|ete Line|
|00002000| 73 3a 3a 2e 0a 0a 60 25 | 4c 27 0a 20 20 20 20 20 |s::...`%|L'. |
|00002010| 73 74 61 6e 64 73 20 66 | 6f 72 20 74 68 65 20 74 |stands f|or the t|
|00002020| 68 65 20 63 6f 6e 74 65 | 6e 74 73 20 6f 66 20 74 |he conte|nts of t|
|00002030| 68 65 20 6c 69 6e 65 2c | 20 69 6e 63 6c 75 64 69 |he line,| includi|
|00002040| 6e 67 20 69 74 73 20 74 | 72 61 69 6c 69 6e 67 0a |ng its t|railing.|
|00002050| 20 20 20 20 20 6e 65 77 | 6c 69 6e 65 20 28 69 66 | new|line (if|
|00002060| 20 61 6e 79 29 2e 20 20 | 49 66 20 61 20 6c 69 6e | any). |If a lin|
|00002070| 65 20 69 73 20 69 6e 63 | 6f 6d 70 6c 65 74 65 2c |e is inc|omplete,|
|00002080| 20 74 68 69 73 20 66 6f | 72 6d 61 74 20 70 72 65 | this fo|rmat pre|
|00002090| 73 65 72 76 65 73 0a 20 | 20 20 20 20 69 74 73 20 |serves. | its |
|000020a0| 69 6e 63 6f 6d 70 6c 65 | 74 65 6e 65 73 73 2e 0a |incomple|teness..|
|000020b0| 0a 60 25 25 27 0a 20 20 | 20 20 20 73 74 61 6e 64 |.`%%'. | stand|
|000020c0| 73 20 66 6f 72 20 60 25 | 27 2e 0a 0a 60 25 63 27 |s for `%|'...`%c'|
|000020d0| 43 27 27 0a 20 20 20 20 | 20 77 68 65 72 65 20 43 |C''. | where C|
|000020e0| 20 69 73 20 61 20 73 69 | 6e 67 6c 65 20 63 68 61 | is a si|ngle cha|
|000020f0| 72 61 63 74 65 72 2c 20 | 73 74 61 6e 64 73 20 66 |racter, |stands f|
|00002100| 6f 72 20 43 2e 20 20 43 | 20 6d 61 79 20 6e 6f 74 |or C. C| may not|
|00002110| 20 62 65 20 61 0a 20 20 | 20 20 20 62 61 63 6b 73 | be a. | backs|
|00002120| 6c 61 73 68 20 6f 72 20 | 61 6e 20 61 70 6f 73 74 |lash or |an apost|
|00002130| 72 6f 70 68 65 2e 20 20 | 46 6f 72 20 65 78 61 6d |rophe. |For exam|
|00002140| 70 6c 65 2c 20 60 25 63 | 27 3a 27 27 20 73 74 61 |ple, `%c|':'' sta|
|00002150| 6e 64 73 20 66 6f 72 20 | 61 0a 20 20 20 20 20 63 |nds for |a. c|
|00002160| 6f 6c 6f 6e 2e 0a 0a 60 | 25 63 27 5c 4f 27 27 0a |olon...`|%c'\O''.|
|00002170| 20 20 20 20 20 77 68 65 | 72 65 20 4f 20 69 73 20 | whe|re O is |
|00002180| 61 20 73 74 72 69 6e 67 | 20 6f 66 20 31 2c 20 32 |a string| of 1, 2|
|00002190| 2c 20 6f 72 20 33 20 6f | 63 74 61 6c 20 64 69 67 |, or 3 o|ctal dig|
|000021a0| 69 74 73 2c 20 73 74 61 | 6e 64 73 20 66 6f 72 20 |its, sta|nds for |
|000021b0| 74 68 65 0a 20 20 20 20 | 20 63 68 61 72 61 63 74 |the. | charact|
|000021c0| 65 72 20 77 69 74 68 20 | 6f 63 74 61 6c 20 63 6f |er with |octal co|
|000021d0| 64 65 20 4f 2e 20 20 46 | 6f 72 20 65 78 61 6d 70 |de O. F|or examp|
|000021e0| 6c 65 2c 20 60 25 63 27 | 5c 30 27 27 20 73 74 61 |le, `%c'|\0'' sta|
|000021f0| 6e 64 73 20 66 6f 72 20 | 61 0a 20 20 20 20 20 6e |nds for |a. n|
|00002200| 75 6c 6c 20 63 68 61 72 | 61 63 74 65 72 2e 0a 0a |ull char|acter...|
|00002210| 60 46 6e 27 0a 20 20 20 | 20 20 77 68 65 72 65 20 |`Fn'. | where |
|00002220| 46 20 69 73 20 61 20 60 | 70 72 69 6e 74 66 27 20 |F is a `|printf' |
|00002230| 63 6f 6e 76 65 72 73 69 | 6f 6e 20 73 70 65 63 69 |conversi|on speci|
|00002240| 66 69 63 61 74 69 6f 6e | 2c 20 73 74 61 6e 64 73 |fication|, stands|
|00002250| 20 66 6f 72 20 74 68 65 | 0a 20 20 20 20 20 6c 69 | for the|. li|
|00002260| 6e 65 20 6e 75 6d 62 65 | 72 20 66 6f 72 6d 61 74 |ne numbe|r format|
|00002270| 74 65 64 20 77 69 74 68 | 20 46 2e 20 20 46 6f 72 |ted with| F. For|
|00002280| 20 65 78 61 6d 70 6c 65 | 2c 20 60 25 2e 35 64 6e | example|, `%.5dn|
|00002290| 27 20 70 72 69 6e 74 73 | 20 74 68 65 0a 20 20 20 |' prints| the. |
|000022a0| 20 20 6c 69 6e 65 20 6e | 75 6d 62 65 72 20 75 73 | line n|umber us|
|000022b0| 69 6e 67 20 74 68 65 20 | 60 70 72 69 6e 74 66 27 |ing the |`printf'|
|000022c0| 20 66 6f 72 6d 61 74 20 | 60 22 25 2e 35 64 22 27 | format |`"%.5d"'|
|000022d0| 2e 20 20 2a 4e 6f 74 65 | 20 4c 69 6e 65 20 47 72 |. *Note| Line Gr|
|000022e0| 6f 75 70 0a 20 20 20 20 | 20 46 6f 72 6d 61 74 73 |oup. | Formats|
|000022f0| 3a 3a 2c 20 66 6f 72 20 | 6d 6f 72 65 20 61 62 6f |::, for |more abo|
|00002300| 75 74 20 70 72 69 6e 74 | 66 20 63 6f 6e 76 65 72 |ut print|f conver|
|00002310| 73 69 6f 6e 20 73 70 65 | 63 69 66 69 63 61 74 69 |sion spe|cificati|
|00002320| 6f 6e 73 2e 0a 0a 20 20 | 20 54 68 65 20 64 65 66 |ons... | The def|
|00002330| 61 75 6c 74 20 6c 69 6e | 65 20 66 6f 72 6d 61 74 |ault lin|e format|
|00002340| 20 69 73 20 60 25 6c 27 | 20 66 6f 6c 6c 6f 77 65 | is `%l'| followe|
|00002350| 64 20 62 79 20 61 20 6e | 65 77 6c 69 6e 65 20 63 |d by a n|ewline c|
|00002360| 68 61 72 61 63 74 65 72 | 2e 0a 0a 20 20 20 49 66 |haracter|... If|
|00002370| 20 74 68 65 20 69 6e 70 | 75 74 20 63 6f 6e 74 61 | the inp|ut conta|
|00002380| 69 6e 73 20 74 61 62 20 | 63 68 61 72 61 63 74 65 |ins tab |characte|
|00002390| 72 73 20 61 6e 64 20 69 | 74 20 69 73 20 69 6d 70 |rs and i|t is imp|
|000023a0| 6f 72 74 61 6e 74 20 74 | 68 61 74 20 74 68 65 79 |ortant t|hat they|
|000023b0| 0a 6c 69 6e 65 20 75 70 | 20 6f 6e 20 6f 75 74 70 |.line up| on outp|
|000023c0| 75 74 2c 20 79 6f 75 20 | 73 68 6f 75 6c 64 20 65 |ut, you |should e|
|000023d0| 6e 73 75 72 65 20 74 68 | 61 74 20 60 25 6c 27 20 |nsure th|at `%l' |
|000023e0| 6f 72 20 60 25 4c 27 20 | 69 6e 20 61 20 6c 69 6e |or `%L' |in a lin|
|000023f0| 65 20 66 6f 72 6d 61 74 | 0a 69 73 20 6a 75 73 74 |e format|.is just|
|00002400| 20 61 66 74 65 72 20 61 | 20 74 61 62 20 73 74 6f | after a| tab sto|
|00002410| 70 20 28 65 2e 67 2e 20 | 62 79 20 70 72 65 63 65 |p (e.g. |by prece|
|00002420| 64 69 6e 67 20 60 25 6c | 27 20 6f 72 20 60 25 4c |ding `%l|' or `%L|
|00002430| 27 20 77 69 74 68 20 61 | 20 74 61 62 0a 63 68 61 |' with a| tab.cha|
|00002440| 72 61 63 74 65 72 29 2c | 20 6f 72 20 79 6f 75 20 |racter),| or you |
|00002450| 73 68 6f 75 6c 64 20 75 | 73 65 20 74 68 65 20 60 |should u|se the `|
|00002460| 2d 74 27 20 6f 72 20 60 | 2d 2d 65 78 70 61 6e 64 |-t' or `|--expand|
|00002470| 2d 74 61 62 73 27 20 6f | 70 74 69 6f 6e 2e 0a 0a |-tabs' o|ption...|
|00002480| 20 20 20 54 61 6b 65 6e | 20 74 6f 67 65 74 68 65 | Taken| togethe|
|00002490| 72 2c 20 74 68 65 20 6c | 69 6e 65 20 61 6e 64 20 |r, the l|ine and |
|000024a0| 6c 69 6e 65 20 67 72 6f | 75 70 20 66 6f 72 6d 61 |line gro|up forma|
|000024b0| 74 73 20 6c 65 74 20 79 | 6f 75 20 73 70 65 63 69 |ts let y|ou speci|
|000024c0| 66 79 20 6d 61 6e 79 0a | 64 69 66 66 65 72 65 6e |fy many.|differen|
|000024d0| 74 20 66 6f 72 6d 61 74 | 73 2e 20 20 46 6f 72 20 |t format|s. For |
|000024e0| 65 78 61 6d 70 6c 65 2c | 20 74 68 65 20 66 6f 6c |example,| the fol|
|000024f0| 6c 6f 77 69 6e 67 20 63 | 6f 6d 6d 61 6e 64 20 75 |lowing c|ommand u|
|00002500| 73 65 73 20 61 20 66 6f | 72 6d 61 74 0a 73 69 6d |ses a fo|rmat.sim|
|00002510| 69 6c 61 72 20 74 6f 20 | 60 64 69 66 66 27 27 73 |ilar to |`diff''s|
|00002520| 20 6e 6f 72 6d 61 6c 20 | 66 6f 72 6d 61 74 2e 20 | normal |format. |
|00002530| 20 59 6f 75 20 63 61 6e | 20 74 61 69 6c 6f 72 20 | You can| tailor |
|00002540| 74 68 69 73 20 63 6f 6d | 6d 61 6e 64 20 74 6f 20 |this com|mand to |
|00002550| 67 65 74 0a 66 69 6e 65 | 20 63 6f 6e 74 72 6f 6c |get.fine| control|
|00002560| 20 6f 76 65 72 20 60 64 | 69 66 66 27 27 73 20 6f | over `d|iff''s o|
|00002570| 75 74 70 75 74 2e 0a 0a | 20 20 20 20 20 64 69 66 |utput...| dif|
|00002580| 66 20 5c 0a 20 20 20 20 | 20 20 20 20 2d 2d 6f 6c |f \. | --ol|
|00002590| 64 2d 6c 69 6e 65 2d 66 | 6f 72 6d 61 74 3d 27 3c |d-line-f|ormat='<|
|000025a0| 20 25 6c 0a 20 20 20 20 | 20 27 20 5c 0a 20 20 20 | %l. | ' \. |
|000025b0| 20 20 20 20 20 2d 2d 6e | 65 77 2d 6c 69 6e 65 2d | --n|ew-line-|
|000025c0| 66 6f 72 6d 61 74 3d 27 | 3e 20 25 6c 0a 20 20 20 |format='|> %l. |
|000025d0| 20 20 27 20 5c 0a 20 20 | 20 20 20 20 20 20 2d 2d | ' \. | --|
|000025e0| 6f 6c 64 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |old-grou|p-format|
|000025f0| 3d 27 25 64 66 25 28 66 | 3d 6c 3f 3a 2c 25 64 6c |='%df%(f|=l?:,%dl|
|00002600| 29 64 25 64 45 0a 20 20 | 20 20 20 25 3c 27 20 5c |)d%dE. | %<' \|
|00002610| 0a 20 20 20 20 20 20 20 | 20 2d 2d 6e 65 77 2d 67 |. | --new-g|
|00002620| 72 6f 75 70 2d 66 6f 72 | 6d 61 74 3d 27 25 64 65 |roup-for|mat='%de|
|00002630| 61 25 64 46 25 28 46 3d | 4c 3f 3a 2c 25 64 4c 29 |a%dF%(F=|L?:,%dL)|
|00002640| 0a 20 20 20 20 20 25 3e | 27 20 5c 0a 20 20 20 20 |. %>|' \. |
|00002650| 20 20 20 20 2d 2d 63 68 | 61 6e 67 65 64 2d 67 72 | --ch|anged-gr|
|00002660| 6f 75 70 2d 66 6f 72 6d | 61 74 3d 27 25 64 66 25 |oup-form|at='%df%|
|00002670| 28 66 3d 6c 3f 3a 2c 25 | 64 6c 29 63 25 64 46 25 |(f=l?:,%|dl)c%dF%|
|00002680| 28 46 3d 4c 3f 3a 2c 25 | 64 4c 29 0a 20 20 20 20 |(F=L?:,%|dL). |
|00002690| 20 25 3c 2d 2d 2d 0a 20 | 20 20 20 20 25 3e 27 20 | %<---. | %>' |
|000026a0| 5c 0a 20 20 20 20 20 20 | 20 20 2d 2d 75 6e 63 68 |\. | --unch|
|000026b0| 61 6e 67 65 64 2d 67 72 | 6f 75 70 2d 66 6f 72 6d |anged-gr|oup-form|
|000026c0| 61 74 3d 27 27 20 5c 0a | 20 20 20 20 20 20 20 20 |at='' \.| |
|000026d0| 6f 6c 64 20 6e 65 77 0a | 0a 1f 0a 46 69 6c 65 3a |old new.|...File:|
|000026e0| 20 64 69 66 66 2e 69 6e | 66 6f 2c 20 20 4e 6f 64 | diff.in|fo, Nod|
|000026f0| 65 3a 20 44 65 74 61 69 | 6c 65 64 20 49 66 2d 74 |e: Detai|led If-t|
|00002700| 68 65 6e 2d 65 6c 73 65 | 2c 20 20 4e 65 78 74 3a |hen-else|, Next:|
|00002710| 20 45 78 61 6d 70 6c 65 | 20 49 66 2d 74 68 65 6e | Example| If-then|
|00002720| 2d 65 6c 73 65 2c 20 20 | 50 72 65 76 3a 20 4c 69 |-else, |Prev: Li|
|00002730| 6e 65 20 46 6f 72 6d 61 | 74 73 2c 20 20 55 70 3a |ne Forma|ts, Up:|
|00002740| 20 49 66 2d 74 68 65 6e | 2d 65 6c 73 65 0a 0a 44 | If-then|-else..D|
|00002750| 65 74 61 69 6c 65 64 20 | 44 65 73 63 72 69 70 74 |etailed |Descript|
|00002760| 69 6f 6e 20 6f 66 20 49 | 66 2d 74 68 65 6e 2d 65 |ion of I|f-then-e|
|00002770| 6c 73 65 20 46 6f 72 6d | 61 74 0a 2d 2d 2d 2d 2d |lse Form|at.-----|
|00002780| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002790| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000027a0| 2d 2d 2d 2d 2d 2d 0a 0a | 20 20 20 46 6f 72 20 6c |------..| For l|
|000027b0| 69 6e 65 73 20 63 6f 6d | 6d 6f 6e 20 74 6f 20 62 |ines com|mon to b|
|000027c0| 6f 74 68 20 66 69 6c 65 | 73 2c 20 60 64 69 66 66 |oth file|s, `diff|
|000027d0| 27 20 75 73 65 73 20 74 | 68 65 20 75 6e 63 68 61 |' uses t|he uncha|
|000027e0| 6e 67 65 64 20 6c 69 6e | 65 20 67 72 6f 75 70 0a |nged lin|e group.|
|000027f0| 66 6f 72 6d 61 74 2e 20 | 20 46 6f 72 20 65 61 63 |format. | For eac|
|00002800| 68 20 68 75 6e 6b 20 6f | 66 20 64 69 66 66 65 72 |h hunk o|f differ|
|00002810| 65 6e 63 65 73 20 69 6e | 20 74 68 65 20 6d 65 72 |ences in| the mer|
|00002820| 67 65 64 20 6f 75 74 70 | 75 74 20 66 6f 72 6d 61 |ged outp|ut forma|
|00002830| 74 2c 20 69 66 0a 74 68 | 65 20 68 75 6e 6b 20 63 |t, if.th|e hunk c|
|00002840| 6f 6e 74 61 69 6e 73 20 | 6f 6e 6c 79 20 6c 69 6e |ontains |only lin|
|00002850| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 66 69 72 73 |es from |the firs|
|00002860| 74 20 66 69 6c 65 2c 20 | 60 64 69 66 66 27 20 75 |t file, |`diff' u|
|00002870| 73 65 73 20 74 68 65 20 | 6f 6c 64 0a 6c 69 6e 65 |ses the |old.line|
|00002880| 20 67 72 6f 75 70 20 66 | 6f 72 6d 61 74 3b 20 69 | group f|ormat; i|
|00002890| 66 20 74 68 65 20 68 75 | 6e 6b 20 63 6f 6e 74 61 |f the hu|nk conta|
|000028a0| 69 6e 73 20 6f 6e 6c 79 | 20 6c 69 6e 65 73 20 66 |ins only| lines f|
|000028b0| 72 6f 6d 20 74 68 65 20 | 73 65 63 6f 6e 64 0a 66 |rom the |second.f|
|000028c0| 69 6c 65 2c 20 60 64 69 | 66 66 27 20 75 73 65 73 |ile, `di|ff' uses|
|000028d0| 20 74 68 65 20 6e 65 77 | 20 67 72 6f 75 70 20 66 | the new| group f|
|000028e0| 6f 72 6d 61 74 3b 20 6f | 74 68 65 72 77 69 73 65 |ormat; o|therwise|
|000028f0| 2c 20 60 64 69 66 66 27 | 20 75 73 65 73 20 74 68 |, `diff'| uses th|
|00002900| 65 0a 63 68 61 6e 67 65 | 64 20 67 72 6f 75 70 20 |e.change|d group |
|00002910| 66 6f 72 6d 61 74 2e 0a | 0a 20 20 20 54 68 65 20 |format..|. The |
|00002920| 6f 6c 64 2c 20 6e 65 77 | 2c 20 61 6e 64 20 75 6e |old, new|, and un|
|00002930| 63 68 61 6e 67 65 64 20 | 6c 69 6e 65 20 66 6f 72 |changed |line for|
|00002940| 6d 61 74 73 20 73 70 65 | 63 69 66 79 20 74 68 65 |mats spe|cify the|
|00002950| 20 6f 75 74 70 75 74 20 | 66 6f 72 6d 61 74 20 6f | output |format o|
|00002960| 66 0a 6c 69 6e 65 73 20 | 66 72 6f 6d 20 74 68 65 |f.lines |from the|
|00002970| 20 66 69 72 73 74 20 66 | 69 6c 65 2c 20 6c 69 6e | first f|ile, lin|
|00002980| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 73 65 63 6f |es from |the seco|
|00002990| 6e 64 20 66 69 6c 65 2c | 20 61 6e 64 20 6c 69 6e |nd file,| and lin|
|000029a0| 65 73 20 63 6f 6d 6d 6f | 6e 0a 74 6f 20 62 6f 74 |es commo|n.to bot|
|000029b0| 68 20 66 69 6c 65 73 2c | 20 72 65 73 70 65 63 74 |h files,| respect|
|000029c0| 69 76 65 6c 79 2e 0a 0a | 20 20 20 54 68 65 20 6f |ively...| The o|
|000029d0| 70 74 69 6f 6e 20 60 2d | 2d 69 66 64 65 66 3d 4e |ption `-|-ifdef=N|
|000029e0| 41 4d 45 27 20 69 73 20 | 65 71 75 69 76 61 6c 65 |AME' is |equivale|
|000029f0| 6e 74 20 74 6f 20 74 68 | 65 20 66 6f 6c 6c 6f 77 |nt to th|e follow|
|00002a00| 69 6e 67 20 73 65 71 75 | 65 6e 63 65 20 6f 66 0a |ing sequ|ence of.|
|00002a10| 6f 70 74 69 6f 6e 73 20 | 75 73 69 6e 67 20 73 68 |options |using sh|
|00002a20| 65 6c 6c 20 73 79 6e 74 | 61 78 3a 0a 0a 20 20 20 |ell synt|ax:.. |
|00002a30| 20 20 2d 2d 6f 6c 64 2d | 67 72 6f 75 70 2d 66 6f | --old-|group-fo|
|00002a40| 72 6d 61 74 3d 27 23 69 | 66 6e 64 65 66 20 4e 41 |rmat='#i|fndef NA|
|00002a50| 4d 45 0a 20 20 20 20 20 | 25 3c 23 65 6e 64 69 66 |ME. |%<#endif|
|00002a60| 20 2f 2a 20 6e 6f 74 20 | 4e 41 4d 45 20 2a 2f 0a | /* not |NAME */.|
|00002a70| 20 20 20 20 20 27 20 5c | 0a 20 20 20 20 20 2d 2d | ' \|. --|
|00002a80| 6e 65 77 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |new-grou|p-format|
|00002a90| 3d 27 23 69 66 64 65 66 | 20 4e 41 4d 45 0a 20 20 |='#ifdef| NAME. |
|00002aa0| 20 20 20 25 3e 23 65 6e | 64 69 66 20 2f 2a 20 4e | %>#en|dif /* N|
|00002ab0| 41 4d 45 20 2a 2f 0a 20 | 20 20 20 20 27 20 5c 0a |AME */. | ' \.|
|00002ac0| 20 20 20 20 20 2d 2d 75 | 6e 63 68 61 6e 67 65 64 | --u|nchanged|
|00002ad0| 2d 67 72 6f 75 70 2d 66 | 6f 72 6d 61 74 3d 27 25 |-group-f|ormat='%|
|00002ae0| 3d 27 20 5c 0a 20 20 20 | 20 20 2d 2d 63 68 61 6e |=' \. | --chan|
|00002af0| 67 65 64 2d 67 72 6f 75 | 70 2d 66 6f 72 6d 61 74 |ged-grou|p-format|
|00002b00| 3d 27 23 69 66 6e 64 65 | 66 20 4e 41 4d 45 0a 20 |='#ifnde|f NAME. |
|00002b10| 20 20 20 20 25 3c 23 65 | 6c 73 65 20 2f 2a 20 4e | %<#e|lse /* N|
|00002b20| 41 4d 45 20 2a 2f 0a 20 | 20 20 20 20 25 3e 23 65 |AME */. | %>#e|
|00002b30| 6e 64 69 66 20 2f 2a 20 | 4e 41 4d 45 20 2a 2f 0a |ndif /* |NAME */.|
|00002b40| 20 20 20 20 20 27 0a 0a | 20 20 20 59 6f 75 20 73 | '..| You s|
|00002b50| 68 6f 75 6c 64 20 63 61 | 72 65 66 75 6c 6c 79 20 |hould ca|refully |
|00002b60| 63 68 65 63 6b 20 74 68 | 65 20 60 64 69 66 66 27 |check th|e `diff'|
|00002b70| 20 6f 75 74 70 75 74 20 | 66 6f 72 20 70 72 6f 70 | output |for prop|
|00002b80| 65 72 20 6e 65 73 74 69 | 6e 67 2e 0a 46 6f 72 20 |er nesti|ng..For |
|00002b90| 65 78 61 6d 70 6c 65 2c | 20 77 68 65 6e 20 75 73 |example,| when us|
|00002ba0| 69 6e 67 20 74 68 65 20 | 74 68 65 20 60 2d 44 20 |ing the |the `-D |
|00002bb0| 4e 41 4d 45 27 20 6f 72 | 20 60 2d 2d 69 66 64 65 |NAME' or| `--ifde|
|00002bc0| 66 3d 4e 41 4d 45 27 20 | 6f 70 74 69 6f 6e 2c 20 |f=NAME' |option, |
|00002bd0| 79 6f 75 0a 73 68 6f 75 | 6c 64 20 63 68 65 63 6b |you.shou|ld check|
|00002be0| 20 74 68 61 74 20 69 66 | 20 74 68 65 20 64 69 66 | that if| the dif|
|00002bf0| 66 65 72 69 6e 67 20 6c | 69 6e 65 73 20 63 6f 6e |fering l|ines con|
|00002c00| 74 61 69 6e 20 61 6e 79 | 20 6f 66 20 74 68 65 20 |tain any| of the |
|00002c10| 43 0a 70 72 65 70 72 6f | 63 65 73 73 6f 72 20 64 |C.prepro|cessor d|
|00002c20| 69 72 65 63 74 69 76 65 | 73 20 60 23 69 66 64 65 |irective|s `#ifde|
|00002c30| 66 27 2c 20 60 23 69 66 | 6e 64 65 66 27 2c 20 60 |f', `#if|ndef', `|
|00002c40| 23 65 6c 73 65 27 2c 20 | 60 23 65 6c 69 66 27 2c |#else', |`#elif',|
|00002c50| 20 6f 72 0a 60 23 65 6e | 64 69 66 27 2c 20 74 68 | or.`#en|dif', th|
|00002c60| 65 79 20 61 72 65 20 6e | 65 73 74 65 64 20 70 72 |ey are n|ested pr|
|00002c70| 6f 70 65 72 6c 79 20 61 | 6e 64 20 6d 61 74 63 68 |operly a|nd match|
|00002c80| 2e 20 20 49 66 20 74 68 | 65 79 20 64 6f 6e 27 74 |. If th|ey don't|
|00002c90| 2c 20 79 6f 75 20 6d 75 | 73 74 0a 6d 61 6b 65 20 |, you mu|st.make |
|00002ca0| 63 6f 72 72 65 63 74 69 | 6f 6e 73 20 6d 61 6e 75 |correcti|ons manu|
|00002cb0| 61 6c 6c 79 2e 20 20 49 | 74 20 69 73 20 61 20 67 |ally. I|t is a g|
|00002cc0| 6f 6f 64 20 69 64 65 61 | 20 74 6f 20 63 61 72 65 |ood idea| to care|
|00002cd0| 66 75 6c 6c 79 20 63 68 | 65 63 6b 20 74 68 65 0a |fully ch|eck the.|
|00002ce0| 72 65 73 75 6c 74 69 6e | 67 20 63 6f 64 65 20 61 |resultin|g code a|
|00002cf0| 6e 79 77 61 79 20 74 6f | 20 6d 61 6b 65 20 73 75 |nyway to| make su|
|00002d00| 72 65 20 74 68 61 74 20 | 69 74 20 72 65 61 6c 6c |re that |it reall|
|00002d10| 79 20 64 6f 65 73 20 77 | 68 61 74 20 79 6f 75 20 |y does w|hat you |
|00002d20| 77 61 6e 74 20 69 74 0a | 74 6f 3b 20 64 65 70 65 |want it.|to; depe|
|00002d30| 6e 64 69 6e 67 20 6f 6e | 20 68 6f 77 20 74 68 65 |nding on| how the|
|00002d40| 20 69 6e 70 75 74 20 66 | 69 6c 65 73 20 77 65 72 | input f|iles wer|
|00002d50| 65 20 70 72 6f 64 75 63 | 65 64 2c 20 74 68 65 20 |e produc|ed, the |
|00002d60| 6f 75 74 70 75 74 20 6d | 69 67 68 74 0a 63 6f 6e |output m|ight.con|
|00002d70| 74 61 69 6e 20 64 75 70 | 6c 69 63 61 74 65 20 6f |tain dup|licate o|
|00002d80| 72 20 6f 74 68 65 72 77 | 69 73 65 20 69 6e 63 6f |r otherw|ise inco|
|00002d90| 72 72 65 63 74 20 63 6f | 64 65 2e 0a 0a 20 20 20 |rrect co|de... |
|00002da0| 54 68 65 20 60 70 61 74 | 63 68 27 20 60 2d 44 20 |The `pat|ch' `-D |
|00002db0| 4e 41 4d 45 27 20 6f 70 | 74 69 6f 6e 20 62 65 68 |NAME' op|tion beh|
|00002dc0| 61 76 65 73 20 6a 75 73 | 74 20 6c 69 6b 65 20 74 |aves jus|t like t|
|00002dd0| 68 65 20 60 64 69 66 66 | 27 20 60 2d 44 20 4e 41 |he `diff|' `-D NA|
|00002de0| 4d 45 27 0a 6f 70 74 69 | 6f 6e 2c 20 65 78 63 65 |ME'.opti|on, exce|
|00002df0| 70 74 20 69 74 20 6f 70 | 65 72 61 74 65 73 20 6f |pt it op|erates o|
|00002e00| 6e 20 61 20 66 69 6c 65 | 20 61 6e 64 20 61 20 64 |n a file| and a d|
|00002e10| 69 66 66 20 74 6f 20 70 | 72 6f 64 75 63 65 20 61 |iff to p|roduce a|
|00002e20| 20 6d 65 72 67 65 64 0a | 66 69 6c 65 3b 20 2a 4e | merged.|file; *N|
|00002e30| 6f 74 65 20 70 61 74 63 | 68 20 4f 70 74 69 6f 6e |ote patc|h Option|
|00002e40| 73 3a 3a 2e 0a 0a 1f 0a | 46 69 6c 65 3a 20 64 69 |s::.....|File: di|
|00002e50| 66 66 2e 69 6e 66 6f 2c | 20 20 4e 6f 64 65 3a 20 |ff.info,| Node: |
|00002e60| 45 78 61 6d 70 6c 65 20 | 49 66 2d 74 68 65 6e 2d |Example |If-then-|
|00002e70| 65 6c 73 65 2c 20 20 50 | 72 65 76 3a 20 44 65 74 |else, P|rev: Det|
|00002e80| 61 69 6c 65 64 20 49 66 | 2d 74 68 65 6e 2d 65 6c |ailed If|-then-el|
|00002e90| 73 65 2c 20 20 55 70 3a | 20 49 66 2d 74 68 65 6e |se, Up:| If-then|
|00002ea0| 2d 65 6c 73 65 0a 0a 41 | 6e 20 45 78 61 6d 70 6c |-else..A|n Exampl|
|00002eb0| 65 20 6f 66 20 49 66 2d | 74 68 65 6e 2d 65 6c 73 |e of If-|then-els|
|00002ec0| 65 20 46 6f 72 6d 61 74 | 0a 2d 2d 2d 2d 2d 2d 2d |e Format|.-------|
|00002ed0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002ee0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 0a 0a 20 20 20 48 |--------|--.. H|
|00002ef0| 65 72 65 20 69 73 20 74 | 68 65 20 6f 75 74 70 75 |ere is t|he outpu|
|00002f00| 74 20 6f 66 20 60 64 69 | 66 66 20 2d 44 54 57 4f |t of `di|ff -DTWO|
|00002f10| 20 6c 61 6f 20 74 7a 75 | 27 20 28 2a 6e 6f 74 65 | lao tzu|' (*note|
|00002f20| 20 53 61 6d 70 6c 65 20 | 64 69 66 66 0a 49 6e 70 | Sample |diff.Inp|
|00002f30| 75 74 3a 3a 2e 2c 20 66 | 6f 72 20 74 68 65 20 63 |ut::., f|or the c|
|00002f40| 6f 6d 70 6c 65 74 65 20 | 63 6f 6e 74 65 6e 74 73 |omplete |contents|
|00002f50| 20 6f 66 20 74 68 65 20 | 74 77 6f 20 66 69 6c 65 | of the |two file|
|00002f60| 73 29 3a 0a 0a 20 20 20 | 20 20 23 69 66 6e 64 65 |s):.. | #ifnde|
|00002f70| 66 20 54 57 4f 0a 20 20 | 20 20 20 54 68 65 20 57 |f TWO. | The W|
|00002f80| 61 79 20 74 68 61 74 20 | 63 61 6e 20 62 65 20 74 |ay that |can be t|
|00002f90| 6f 6c 64 20 6f 66 20 69 | 73 20 6e 6f 74 20 74 68 |old of i|s not th|
|00002fa0| 65 20 65 74 65 72 6e 61 | 6c 20 57 61 79 3b 0a 20 |e eterna|l Way;. |
|00002fb0| 20 20 20 20 54 68 65 20 | 6e 61 6d 65 20 74 68 61 | The |name tha|
|00002fc0| 74 20 63 61 6e 20 62 65 | 20 6e 61 6d 65 64 20 69 |t can be| named i|
|00002fd0| 73 20 6e 6f 74 20 74 68 | 65 20 65 74 65 72 6e 61 |s not th|e eterna|
|00002fe0| 6c 20 6e 61 6d 65 2e 0a | 20 20 20 20 20 23 65 6e |l name..| #en|
|00002ff0| 64 69 66 20 2f 2a 20 6e | 6f 74 20 54 57 4f 20 2a |dif /* n|ot TWO *|
|00003000| 2f 0a 20 20 20 20 20 54 | 68 65 20 4e 61 6d 65 6c |/. T|he Namel|
|00003010| 65 73 73 20 69 73 20 74 | 68 65 20 6f 72 69 67 69 |ess is t|he origi|
|00003020| 6e 20 6f 66 20 48 65 61 | 76 65 6e 20 61 6e 64 20 |n of Hea|ven and |
|00003030| 45 61 72 74 68 3b 0a 20 | 20 20 20 20 23 69 66 6e |Earth;. | #ifn|
|00003040| 64 65 66 20 54 57 4f 0a | 20 20 20 20 20 54 68 65 |def TWO.| The|
|00003050| 20 4e 61 6d 65 64 20 69 | 73 20 74 68 65 20 6d 6f | Named i|s the mo|
|00003060| 74 68 65 72 20 6f 66 20 | 61 6c 6c 20 74 68 69 6e |ther of |all thin|
|00003070| 67 73 2e 0a 20 20 20 20 | 20 23 65 6c 73 65 20 2f |gs.. | #else /|
|00003080| 2a 20 54 57 4f 20 2a 2f | 0a 20 20 20 20 20 54 68 |* TWO */|. Th|
|00003090| 65 20 6e 61 6d 65 64 20 | 69 73 20 74 68 65 20 6d |e named |is the m|
|000030a0| 6f 74 68 65 72 20 6f 66 | 20 61 6c 6c 20 74 68 69 |other of| all thi|
|000030b0| 6e 67 73 2e 0a 20 20 20 | 20 20 0a 20 20 20 20 20 |ngs.. | . |
|000030c0| 23 65 6e 64 69 66 20 2f | 2a 20 54 57 4f 20 2a 2f |#endif /|* TWO */|
|000030d0| 0a 20 20 20 20 20 54 68 | 65 72 65 66 6f 72 65 20 |. Th|erefore |
|000030e0| 6c 65 74 20 74 68 65 72 | 65 20 61 6c 77 61 79 73 |let ther|e always|
|000030f0| 20 62 65 20 6e 6f 6e 2d | 62 65 69 6e 67 2c 0a 20 | be non-|being,. |
|00003100| 20 20 20 20 20 20 73 6f | 20 77 65 20 6d 61 79 20 | so| we may |
|00003110| 73 65 65 20 74 68 65 69 | 72 20 73 75 62 74 6c 65 |see thei|r subtle|
|00003120| 74 79 2c 0a 20 20 20 20 | 20 41 6e 64 20 6c 65 74 |ty,. | And let|
|00003130| 20 74 68 65 72 65 20 61 | 6c 77 61 79 73 20 62 65 | there a|lways be|
|00003140| 20 62 65 69 6e 67 2c 0a | 20 20 20 20 20 20 20 73 | being,.| s|
|00003150| 6f 20 77 65 20 6d 61 79 | 20 73 65 65 20 74 68 65 |o we may| see the|
|00003160| 69 72 20 6f 75 74 63 6f | 6d 65 2e 0a 20 20 20 20 |ir outco|me.. |
|00003170| 20 54 68 65 20 74 77 6f | 20 61 72 65 20 74 68 65 | The two| are the|
|00003180| 20 73 61 6d 65 2c 0a 20 | 20 20 20 20 42 75 74 20 | same,. | But |
|00003190| 61 66 74 65 72 20 74 68 | 65 79 20 61 72 65 20 70 |after th|ey are p|
|000031a0| 72 6f 64 75 63 65 64 2c | 0a 20 20 20 20 20 20 20 |roduced,|. |
|000031b0| 74 68 65 79 20 68 61 76 | 65 20 64 69 66 66 65 72 |they hav|e differ|
|000031c0| 65 6e 74 20 6e 61 6d 65 | 73 2e 0a 20 20 20 20 20 |ent name|s.. |
|000031d0| 23 69 66 64 65 66 20 54 | 57 4f 0a 20 20 20 20 20 |#ifdef T|WO. |
|000031e0| 54 68 65 79 20 62 6f 74 | 68 20 6d 61 79 20 62 65 |They bot|h may be|
|000031f0| 20 63 61 6c 6c 65 64 20 | 64 65 65 70 20 61 6e 64 | called |deep and|
|00003200| 20 70 72 6f 66 6f 75 6e | 64 2e 0a 20 20 20 20 20 | profoun|d.. |
|00003210| 44 65 65 70 65 72 20 61 | 6e 64 20 6d 6f 72 65 20 |Deeper a|nd more |
|00003220| 70 72 6f 66 6f 75 6e 64 | 2c 0a 20 20 20 20 20 54 |profound|,. T|
|00003230| 68 65 20 64 6f 6f 72 20 | 6f 66 20 61 6c 6c 20 73 |he door |of all s|
|00003240| 75 62 74 6c 65 74 69 65 | 73 21 0a 20 20 20 20 20 |ubtletie|s!. |
|00003250| 23 65 6e 64 69 66 20 2f | 2a 20 54 57 4f 20 2a 2f |#endif /|* TWO */|
|00003260| 0a 0a 1f 0a 46 69 6c 65 | 3a 20 64 69 66 66 2e 69 |....File|: diff.i|
|00003270| 6e 66 6f 2c 20 20 4e 6f | 64 65 3a 20 43 6f 6d 70 |nfo, No|de: Comp|
|00003280| 61 72 69 6e 67 20 44 69 | 72 65 63 74 6f 72 69 65 |aring Di|rectorie|
|00003290| 73 2c 20 20 4e 65 78 74 | 3a 20 41 64 6a 75 73 74 |s, Next|: Adjust|
|000032a0| 69 6e 67 20 4f 75 74 70 | 75 74 2c 20 20 50 72 65 |ing Outp|ut, Pre|
|000032b0| 76 3a 20 4f 75 74 70 75 | 74 20 46 6f 72 6d 61 74 |v: Outpu|t Format|
|000032c0| 73 2c 20 20 55 70 3a 20 | 54 6f 70 0a 0a 43 6f 6d |s, Up: |Top..Com|
|000032d0| 70 61 72 69 6e 67 20 44 | 69 72 65 63 74 6f 72 69 |paring D|irectori|
|000032e0| 65 73 0a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |es.*****|********|
|000032f0| 2a 2a 2a 2a 2a 2a 2a 2a | 0a 0a 20 20 20 59 6f 75 |********|.. You|
|00003300| 20 63 61 6e 20 75 73 65 | 20 60 64 69 66 66 27 20 | can use| `diff' |
|00003310| 74 6f 20 63 6f 6d 70 61 | 72 65 20 73 6f 6d 65 20 |to compa|re some |
|00003320| 6f 72 20 61 6c 6c 20 6f | 66 20 74 68 65 20 66 69 |or all o|f the fi|
|00003330| 6c 65 73 20 69 6e 20 74 | 77 6f 0a 64 69 72 65 63 |les in t|wo.direc|
|00003340| 74 6f 72 79 20 74 72 65 | 65 73 2e 20 20 57 68 65 |tory tre|es. Whe|
|00003350| 6e 20 62 6f 74 68 20 66 | 69 6c 65 20 6e 61 6d 65 |n both f|ile name|
|00003360| 20 61 72 67 75 6d 65 6e | 74 73 20 74 6f 20 60 64 | argumen|ts to `d|
|00003370| 69 66 66 27 20 61 72 65 | 0a 64 69 72 65 63 74 6f |iff' are|.directo|
|00003380| 72 69 65 73 2c 20 69 74 | 20 63 6f 6d 70 61 72 65 |ries, it| compare|
|00003390| 73 20 65 61 63 68 20 66 | 69 6c 65 20 74 68 61 74 |s each f|ile that|
|000033a0| 20 69 73 20 63 6f 6e 74 | 61 69 6e 65 64 20 69 6e | is cont|ained in|
|000033b0| 20 62 6f 74 68 0a 64 69 | 72 65 63 74 6f 72 69 65 | both.di|rectorie|
|000033c0| 73 2c 20 65 78 61 6d 69 | 6e 69 6e 67 20 66 69 6c |s, exami|ning fil|
|000033d0| 65 20 6e 61 6d 65 73 20 | 69 6e 20 61 6c 70 68 61 |e names |in alpha|
|000033e0| 62 65 74 69 63 61 6c 20 | 6f 72 64 65 72 2e 20 20 |betical |order. |
|000033f0| 4e 6f 72 6d 61 6c 6c 79 | 0a 60 64 69 66 66 27 20 |Normally|.`diff' |
|00003400| 69 73 20 73 69 6c 65 6e | 74 20 61 62 6f 75 74 20 |is silen|t about |
|00003410| 70 61 69 72 73 20 6f 66 | 20 66 69 6c 65 73 20 74 |pairs of| files t|
|00003420| 68 61 74 20 63 6f 6e 74 | 61 69 6e 20 6e 6f 20 64 |hat cont|ain no d|
|00003430| 69 66 66 65 72 65 6e 63 | 65 73 2c 20 62 75 74 0a |ifferenc|es, but.|
|00003440| 69 66 20 79 6f 75 20 75 | 73 65 20 74 68 65 20 60 |if you u|se the `|
|00003450| 2d 73 27 20 6f 72 20 60 | 2d 2d 72 65 70 6f 72 74 |-s' or `|--report|
|00003460| 2d 69 64 65 6e 74 69 63 | 61 6c 2d 66 69 6c 65 73 |-identic|al-files|
|00003470| 27 20 6f 70 74 69 6f 6e | 2c 20 69 74 20 72 65 70 |' option|, it rep|
|00003480| 6f 72 74 73 0a 70 61 69 | 72 73 20 6f 66 20 69 64 |orts.pai|rs of id|
|00003490| 65 6e 74 69 63 61 6c 20 | 66 69 6c 65 73 2e 20 20 |entical |files. |
|000034a0| 4e 6f 72 6d 61 6c 6c 79 | 20 60 64 69 66 66 27 20 |Normally| `diff' |
|000034b0| 72 65 70 6f 72 74 73 20 | 73 75 62 64 69 72 65 63 |reports |subdirec|
|000034c0| 74 6f 72 69 65 73 0a 63 | 6f 6d 6d 6f 6e 20 74 6f |tories.c|ommon to|
|000034d0| 20 62 6f 74 68 20 64 69 | 72 65 63 74 6f 72 69 65 | both di|rectorie|
|000034e0| 73 20 77 69 74 68 6f 75 | 74 20 63 6f 6d 70 61 72 |s withou|t compar|
|000034f0| 69 6e 67 20 73 75 62 64 | 69 72 65 63 74 6f 72 69 |ing subd|irectori|
|00003500| 65 73 27 20 66 69 6c 65 | 73 2c 20 62 75 74 0a 69 |es' file|s, but.i|
|00003510| 66 20 79 6f 75 20 75 73 | 65 20 74 68 65 20 60 2d |f you us|e the `-|
|00003520| 72 27 20 6f 72 20 60 2d | 2d 72 65 63 75 72 73 69 |r' or `-|-recursi|
|00003530| 76 65 27 20 6f 70 74 69 | 6f 6e 2c 20 69 74 20 63 |ve' opti|on, it c|
|00003540| 6f 6d 70 61 72 65 73 20 | 65 76 65 72 79 0a 63 6f |ompares |every.co|
|00003550| 72 72 65 73 70 6f 6e 64 | 69 6e 67 20 70 61 69 72 |rrespond|ing pair|
|00003560| 20 6f 66 20 66 69 6c 65 | 73 20 69 6e 20 74 68 65 | of file|s in the|
|00003570| 20 64 69 72 65 63 74 6f | 72 79 20 74 72 65 65 73 | directo|ry trees|
|00003580| 2c 20 61 73 20 6d 61 6e | 79 20 6c 65 76 65 6c 73 |, as man|y levels|
|00003590| 20 64 65 65 70 0a 61 73 | 20 74 68 65 79 20 67 6f | deep.as| they go|
|000035a0| 2e 0a 0a 20 20 20 46 6f | 72 20 66 69 6c 65 20 6e |... Fo|r file n|
|000035b0| 61 6d 65 73 20 74 68 61 | 74 20 61 72 65 20 69 6e |ames tha|t are in|
|000035c0| 20 6f 6e 6c 79 20 6f 6e | 65 20 6f 66 20 74 68 65 | only on|e of the|
|000035d0| 20 64 69 72 65 63 74 6f | 72 69 65 73 2c 20 60 64 | directo|ries, `d|
|000035e0| 69 66 66 27 0a 6e 6f 72 | 6d 61 6c 6c 79 20 64 6f |iff'.nor|mally do|
|000035f0| 65 73 20 6e 6f 74 20 73 | 68 6f 77 20 74 68 65 20 |es not s|how the |
|00003600| 63 6f 6e 74 65 6e 74 73 | 20 6f 66 20 74 68 65 20 |contents| of the |
|00003610| 66 69 6c 65 20 74 68 61 | 74 20 65 78 69 73 74 73 |file tha|t exists|
|00003620| 3b 20 69 74 20 72 65 70 | 6f 72 74 73 0a 6f 6e 6c |; it rep|orts.onl|
|00003630| 79 20 74 68 61 74 20 74 | 68 65 20 66 69 6c 65 20 |y that t|he file |
|00003640| 65 78 69 73 74 73 20 69 | 6e 20 74 68 61 74 20 64 |exists i|n that d|
|00003650| 69 72 65 63 74 6f 72 79 | 20 61 6e 64 20 6e 6f 74 |irectory| and not|
|00003660| 20 69 6e 20 74 68 65 20 | 6f 74 68 65 72 2e 20 20 | in the |other. |
|00003670| 59 6f 75 0a 63 61 6e 20 | 6d 61 6b 65 20 60 64 69 |You.can |make `di|
|00003680| 66 66 27 20 61 63 74 20 | 61 73 20 74 68 6f 75 67 |ff' act |as thoug|
|00003690| 68 20 74 68 65 20 66 69 | 6c 65 20 65 78 69 73 74 |h the fi|le exist|
|000036a0| 65 64 20 62 75 74 20 77 | 61 73 20 65 6d 70 74 79 |ed but w|as empty|
|000036b0| 20 69 6e 20 74 68 65 0a | 6f 74 68 65 72 20 64 69 | in the.|other di|
|000036c0| 72 65 63 74 6f 72 79 2c | 20 73 6f 20 74 68 61 74 |rectory,| so that|
|000036d0| 20 69 74 20 6f 75 74 70 | 75 74 73 20 74 68 65 20 | it outp|uts the |
|000036e0| 65 6e 74 69 72 65 20 63 | 6f 6e 74 65 6e 74 73 20 |entire c|ontents |
|000036f0| 6f 66 20 74 68 65 20 66 | 69 6c 65 20 74 68 61 74 |of the f|ile that|
|00003700| 0a 61 63 74 75 61 6c 6c | 79 20 65 78 69 73 74 73 |.actuall|y exists|
|00003710| 2e 20 20 28 49 74 20 69 | 73 20 6f 75 74 70 75 74 |. (It i|s output|
|00003720| 20 61 73 20 65 69 74 68 | 65 72 20 61 6e 20 69 6e | as eith|er an in|
|00003730| 73 65 72 74 69 6f 6e 20 | 6f 72 20 61 20 64 65 6c |sertion |or a del|
|00003740| 65 74 69 6f 6e 2c 0a 64 | 65 70 65 6e 64 69 6e 67 |etion,.d|epending|
|00003750| 20 6f 6e 20 77 68 65 74 | 68 65 72 20 69 74 20 69 | on whet|her it i|
|00003760| 73 20 69 6e 20 74 68 65 | 20 66 69 72 73 74 20 6f |s in the| first o|
|00003770| 72 20 74 68 65 20 73 65 | 63 6f 6e 64 20 64 69 72 |r the se|cond dir|
|00003780| 65 63 74 6f 72 79 20 67 | 69 76 65 6e 2e 29 0a 54 |ectory g|iven.).T|
|00003790| 6f 20 64 6f 20 74 68 69 | 73 2c 20 75 73 65 20 74 |o do thi|s, use t|
|000037a0| 68 65 20 60 2d 4e 27 20 | 6f 72 20 60 2d 2d 6e 65 |he `-N' |or `--ne|
|000037b0| 77 2d 66 69 6c 65 27 20 | 6f 70 74 69 6f 6e 2e 0a |w-file' |option..|
|000037c0| 0a 20 20 20 49 66 20 74 | 68 65 20 6f 6c 64 65 72 |. If t|he older|
|000037d0| 20 64 69 72 65 63 74 6f | 72 79 20 63 6f 6e 74 61 | directo|ry conta|
|000037e0| 69 6e 73 20 6f 6e 65 20 | 6f 72 20 6d 6f 72 65 20 |ins one |or more |
|000037f0| 6c 61 72 67 65 20 66 69 | 6c 65 73 20 74 68 61 74 |large fi|les that|
|00003800| 20 61 72 65 20 6e 6f 74 | 0a 69 6e 20 74 68 65 20 | are not|.in the |
|00003810| 6e 65 77 65 72 20 64 69 | 72 65 63 74 6f 72 79 2c |newer di|rectory,|
|00003820| 20 79 6f 75 20 63 61 6e | 20 6d 61 6b 65 20 74 68 | you can| make th|
|00003830| 65 20 70 61 74 63 68 20 | 73 6d 61 6c 6c 65 72 20 |e patch |smaller |
|00003840| 62 79 20 75 73 69 6e 67 | 20 74 68 65 0a 60 2d 50 |by using| the.`-P|
|00003850| 27 20 6f 72 20 60 2d 2d | 75 6e 69 64 69 72 65 63 |' or `--|unidirec|
|00003860| 74 69 6f 6e 61 6c 2d 6e | 65 77 2d 66 69 6c 65 27 |tional-n|ew-file'|
|00003870| 20 6f 70 74 69 6f 6e 20 | 69 6e 73 74 65 61 64 20 | option |instead |
|00003880| 6f 66 20 60 2d 4e 27 2e | 20 20 54 68 69 73 0a 6f |of `-N'.| This.o|
|00003890| 70 74 69 6f 6e 20 69 73 | 20 6c 69 6b 65 20 60 2d |ption is| like `-|
|000038a0| 4e 27 20 65 78 63 65 70 | 74 20 74 68 61 74 20 69 |N' excep|t that i|
|000038b0| 74 20 6f 6e 6c 79 20 69 | 6e 73 65 72 74 73 20 74 |t only i|nserts t|
|000038c0| 68 65 20 63 6f 6e 74 65 | 6e 74 73 20 6f 66 20 66 |he conte|nts of f|
|000038d0| 69 6c 65 73 0a 74 68 61 | 74 20 61 70 70 65 61 72 |iles.tha|t appear|
|000038e0| 20 69 6e 20 74 68 65 20 | 73 65 63 6f 6e 64 20 64 | in the |second d|
|000038f0| 69 72 65 63 74 6f 72 79 | 20 62 75 74 20 6e 6f 74 |irectory| but not|
|00003900| 20 74 68 65 20 66 69 72 | 73 74 20 28 74 68 61 74 | the fir|st (that|
|00003910| 20 69 73 2c 20 66 69 6c | 65 73 0a 74 68 61 74 20 | is, fil|es.that |
|00003920| 77 65 72 65 20 61 64 64 | 65 64 29 2e 20 20 41 74 |were add|ed). At|
|00003930| 20 74 68 65 20 74 6f 70 | 20 6f 66 20 74 68 65 20 | the top| of the |
|00003940| 70 61 74 63 68 2c 20 77 | 72 69 74 65 20 69 6e 73 |patch, w|rite ins|
|00003950| 74 72 75 63 74 69 6f 6e | 73 20 66 6f 72 20 74 68 |truction|s for th|
|00003960| 65 0a 75 73 65 72 20 61 | 70 70 6c 79 69 6e 67 20 |e.user a|pplying |
|00003970| 74 68 65 20 70 61 74 63 | 68 20 74 6f 20 72 65 6d |the patc|h to rem|
|00003980| 6f 76 65 20 74 68 65 20 | 66 69 6c 65 73 20 74 68 |ove the |files th|
|00003990| 61 74 20 77 65 72 65 20 | 64 65 6c 65 74 65 64 20 |at were |deleted |
|000039a0| 62 65 66 6f 72 65 0a 61 | 70 70 6c 79 69 6e 67 20 |before.a|pplying |
|000039b0| 74 68 65 20 70 61 74 63 | 68 2e 20 20 2a 4e 6f 74 |the patc|h. *Not|
|000039c0| 65 20 4d 61 6b 69 6e 67 | 20 50 61 74 63 68 65 73 |e Making| Patches|
|000039d0| 3a 3a 2c 20 66 6f 72 20 | 6d 6f 72 65 20 64 69 73 |::, for |more dis|
|000039e0| 63 75 73 73 69 6f 6e 20 | 6f 66 0a 6d 61 6b 69 6e |cussion |of.makin|
|000039f0| 67 20 70 61 74 63 68 65 | 73 20 66 6f 72 20 64 69 |g patche|s for di|
|00003a00| 73 74 72 69 62 75 74 69 | 6f 6e 2e 0a 0a 20 20 20 |stributi|on... |
|00003a10| 54 6f 20 69 67 6e 6f 72 | 65 20 73 6f 6d 65 20 66 |To ignor|e some f|
|00003a20| 69 6c 65 73 20 77 68 69 | 6c 65 20 63 6f 6d 70 61 |iles whi|le compa|
|00003a30| 72 69 6e 67 20 64 69 72 | 65 63 74 6f 72 69 65 73 |ring dir|ectories|
|00003a40| 2c 20 75 73 65 20 74 68 | 65 20 60 2d 78 0a 50 41 |, use th|e `-x.PA|
|00003a50| 54 54 45 52 4e 27 20 6f | 72 20 60 2d 2d 65 78 63 |TTERN' o|r `--exc|
|00003a60| 6c 75 64 65 3d 50 41 54 | 54 45 52 4e 27 20 6f 70 |lude=PAT|TERN' op|
|00003a70| 74 69 6f 6e 2e 20 20 54 | 68 69 73 20 6f 70 74 69 |tion. T|his opti|
|00003a80| 6f 6e 20 69 67 6e 6f 72 | 65 73 20 61 6e 79 20 66 |on ignor|es any f|
|00003a90| 69 6c 65 73 0a 6f 72 20 | 73 75 62 64 69 72 65 63 |iles.or |subdirec|
|00003aa0| 74 6f 72 69 65 73 20 77 | 68 6f 73 65 20 62 61 73 |tories w|hose bas|
|00003ab0| 65 20 6e 61 6d 65 73 20 | 6d 61 74 63 68 20 74 68 |e names |match th|
|00003ac0| 65 20 73 68 65 6c 6c 20 | 70 61 74 74 65 72 6e 20 |e shell |pattern |
|00003ad0| 50 41 54 54 45 52 4e 2e | 0a 55 6e 6c 69 6b 65 20 |PATTERN.|.Unlike |
|00003ae0| 69 6e 20 74 68 65 20 73 | 68 65 6c 6c 2c 20 61 20 |in the s|hell, a |
|00003af0| 70 65 72 69 6f 64 20 61 | 74 20 74 68 65 20 73 74 |period a|t the st|
|00003b00| 61 72 74 20 6f 66 20 74 | 68 65 20 62 61 73 65 20 |art of t|he base |
|00003b10| 6f 66 20 61 20 66 69 6c | 65 20 6e 61 6d 65 0a 6d |of a fil|e name.m|
|00003b20| 61 74 63 68 65 73 20 61 | 20 77 69 6c 64 63 61 72 |atches a| wildcar|
|00003b30| 64 20 61 74 20 74 68 65 | 20 73 74 61 72 74 20 6f |d at the| start o|
|00003b40| 66 20 61 20 70 61 74 74 | 65 72 6e 2e 20 20 59 6f |f a patt|ern. Yo|
|00003b50| 75 20 73 68 6f 75 6c 64 | 20 65 6e 63 6c 6f 73 65 |u should| enclose|
|00003b60| 0a 50 41 54 54 45 52 4e | 20 69 6e 20 71 75 6f 74 |.PATTERN| in quot|
|00003b70| 65 73 20 73 6f 20 74 68 | 61 74 20 74 68 65 20 73 |es so th|at the s|
|00003b80| 68 65 6c 6c 20 64 6f 65 | 73 20 6e 6f 74 20 65 78 |hell doe|s not ex|
|00003b90| 70 61 6e 64 20 69 74 2e | 20 20 46 6f 72 20 65 78 |pand it.| For ex|
|00003ba0| 61 6d 70 6c 65 2c 0a 74 | 68 65 20 6f 70 74 69 6f |ample,.t|he optio|
|00003bb0| 6e 20 60 2d 78 20 27 2a | 2e 5b 61 6f 5d 27 27 20 |n `-x '*|.[ao]'' |
|00003bc0| 69 67 6e 6f 72 65 73 20 | 61 6e 79 20 66 69 6c 65 |ignores |any file|
|00003bd0| 20 77 68 6f 73 65 20 6e | 61 6d 65 20 65 6e 64 73 | whose n|ame ends|
|00003be0| 20 77 69 74 68 20 60 2e | 61 27 20 6f 72 0a 60 2e | with `.|a' or.`.|
|00003bf0| 6f 27 2e 0a 0a 20 20 20 | 54 68 69 73 20 6f 70 74 |o'... |This opt|
|00003c00| 69 6f 6e 20 61 63 63 75 | 6d 75 6c 61 74 65 73 20 |ion accu|mulates |
|00003c10| 69 66 20 79 6f 75 20 73 | 70 65 63 69 66 79 20 69 |if you s|pecify i|
|00003c20| 74 20 6d 6f 72 65 20 74 | 68 61 6e 20 6f 6e 63 65 |t more t|han once|
|00003c30| 2e 20 20 46 6f 72 0a 65 | 78 61 6d 70 6c 65 2c 20 |. For.e|xample, |
|00003c40| 75 73 69 6e 67 20 74 68 | 65 20 6f 70 74 69 6f 6e |using th|e option|
|00003c50| 73 20 60 2d 78 20 27 52 | 43 53 27 20 2d 78 20 27 |s `-x 'R|CS' -x '|
|00003c60| 2a 2c 76 27 27 20 69 67 | 6e 6f 72 65 73 20 61 6e |*,v'' ig|nores an|
|00003c70| 79 20 66 69 6c 65 20 6f | 72 0a 73 75 62 64 69 72 |y file o|r.subdir|
|00003c80| 65 63 74 6f 72 79 20 77 | 68 6f 73 65 20 62 61 73 |ectory w|hose bas|
|00003c90| 65 20 6e 61 6d 65 20 69 | 73 20 60 52 43 53 27 20 |e name i|s `RCS' |
|00003ca0| 6f 72 20 65 6e 64 73 20 | 77 69 74 68 20 60 2c 76 |or ends |with `,v|
|00003cb0| 27 2e 0a 0a 20 20 20 49 | 66 20 79 6f 75 20 6e 65 |'... I|f you ne|
|00003cc0| 65 64 20 74 6f 20 67 69 | 76 65 20 74 68 69 73 20 |ed to gi|ve this |
|00003cd0| 6f 70 74 69 6f 6e 20 6d | 61 6e 79 20 74 69 6d 65 |option m|any time|
|00003ce0| 73 2c 20 79 6f 75 20 63 | 61 6e 20 69 6e 73 74 65 |s, you c|an inste|
|00003cf0| 61 64 20 70 75 74 20 74 | 68 65 0a 70 61 74 74 65 |ad put t|he.patte|
|00003d00| 72 6e 73 20 69 6e 20 61 | 20 66 69 6c 65 2c 20 6f |rns in a| file, o|
|00003d10| 6e 65 20 70 61 74 74 65 | 72 6e 20 70 65 72 20 6c |ne patte|rn per l|
|00003d20| 69 6e 65 2c 20 61 6e 64 | 20 75 73 65 20 74 68 65 |ine, and| use the|
|00003d30| 20 60 2d 58 20 46 49 4c | 45 27 20 6f 72 0a 60 2d | `-X FIL|E' or.`-|
|00003d40| 2d 65 78 63 6c 75 64 65 | 2d 66 72 6f 6d 3d 46 49 |-exclude|-from=FI|
|00003d50| 4c 45 27 20 6f 70 74 69 | 6f 6e 2e 0a 0a 20 20 20 |LE' opti|on... |
|00003d60| 49 66 20 79 6f 75 20 68 | 61 76 65 20 62 65 65 6e |If you h|ave been|
|00003d70| 20 63 6f 6d 70 61 72 69 | 6e 67 20 74 77 6f 20 64 | compari|ng two d|
|00003d80| 69 72 65 63 74 6f 72 69 | 65 73 20 61 6e 64 20 73 |irectori|es and s|
|00003d90| 74 6f 70 70 65 64 20 70 | 61 72 74 77 61 79 0a 74 |topped p|artway.t|
|00003da0| 68 72 6f 75 67 68 2c 20 | 6c 61 74 65 72 20 79 6f |hrough, |later yo|
|00003db0| 75 20 6d 69 67 68 74 20 | 77 61 6e 74 20 74 6f 20 |u might |want to |
|00003dc0| 63 6f 6e 74 69 6e 75 65 | 20 77 68 65 72 65 20 79 |continue| where y|
|00003dd0| 6f 75 20 6c 65 66 74 20 | 6f 66 66 2e 20 20 59 6f |ou left |off. Yo|
|00003de0| 75 20 63 61 6e 0a 64 6f | 20 74 68 69 73 20 62 79 |u can.do| this by|
|00003df0| 20 75 73 69 6e 67 20 74 | 68 65 20 60 2d 53 20 46 | using t|he `-S F|
|00003e00| 49 4c 45 27 20 6f 72 20 | 60 2d 2d 73 74 61 72 74 |ILE' or |`--start|
|00003e10| 69 6e 67 2d 66 69 6c 65 | 3d 46 49 4c 45 27 20 6f |ing-file|=FILE' o|
|00003e20| 70 74 69 6f 6e 2e 20 20 | 54 68 69 73 0a 63 6f 6d |ption. |This.com|
|00003e30| 70 61 72 65 73 20 6f 6e | 6c 79 20 74 68 65 20 66 |pares on|ly the f|
|00003e40| 69 6c 65 20 46 49 4c 45 | 20 61 6e 64 20 61 6c 6c |ile FILE| and all|
|00003e50| 20 61 6c 70 68 61 62 65 | 74 69 63 61 6c 6c 79 20 | alphabe|tically |
|00003e60| 6c 61 74 65 72 20 66 69 | 6c 65 73 20 69 6e 20 74 |later fi|les in t|
|00003e70| 68 65 0a 74 6f 70 6d 6f | 73 74 20 64 69 72 65 63 |he.topmo|st direc|
|00003e80| 74 6f 72 79 20 6c 65 76 | 65 6c 2e 0a 0a 1f 0a 46 |tory lev|el.....F|
|00003e90| 69 6c 65 3a 20 64 69 66 | 66 2e 69 6e 66 6f 2c 20 |ile: dif|f.info, |
|00003ea0| 20 4e 6f 64 65 3a 20 41 | 64 6a 75 73 74 69 6e 67 | Node: A|djusting|
|00003eb0| 20 4f 75 74 70 75 74 2c | 20 20 4e 65 78 74 3a 20 | Output,| Next: |
|00003ec0| 64 69 66 66 20 50 65 72 | 66 6f 72 6d 61 6e 63 65 |diff Per|formance|
|00003ed0| 2c 20 20 50 72 65 76 3a | 20 43 6f 6d 70 61 72 69 |, Prev:| Compari|
|00003ee0| 6e 67 20 44 69 72 65 63 | 74 6f 72 69 65 73 2c 20 |ng Direc|tories, |
|00003ef0| 20 55 70 3a 20 54 6f 70 | 0a 0a 4d 61 6b 69 6e 67 | Up: Top|..Making|
|00003f00| 20 60 64 69 66 66 27 20 | 4f 75 74 70 75 74 20 50 | `diff' |Output P|
|00003f10| 72 65 74 74 69 65 72 0a | 2a 2a 2a 2a 2a 2a 2a 2a |rettier.|********|
|00003f20| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00003f30| 2a 2a 2a 2a 2a 0a 0a 20 | 20 20 60 64 69 66 66 27 |*****.. | `diff'|
|00003f40| 20 70 72 6f 76 69 64 65 | 73 20 73 65 76 65 72 61 | provide|s severa|
|00003f50| 6c 20 77 61 79 73 20 74 | 6f 20 61 64 6a 75 73 74 |l ways t|o adjust|
|00003f60| 20 74 68 65 20 61 70 70 | 65 61 72 61 6e 63 65 20 | the app|earance |
|00003f70| 6f 66 20 69 74 73 20 6f | 75 74 70 75 74 2e 0a 54 |of its o|utput..T|
|00003f80| 68 65 73 65 20 61 64 6a | 75 73 74 6d 65 6e 74 73 |hese adj|ustments|
|00003f90| 20 63 61 6e 20 62 65 20 | 61 70 70 6c 69 65 64 20 | can be |applied |
|00003fa0| 74 6f 20 61 6e 79 20 6f | 75 74 70 75 74 20 66 6f |to any o|utput fo|
|00003fb0| 72 6d 61 74 2e 0a 0a 2a | 20 4d 65 6e 75 3a 0a 0a |rmat...*| Menu:..|
|00003fc0| 2a 20 54 61 62 73 3a 3a | 09 09 50 72 65 73 65 72 |* Tabs::|..Preser|
|00003fd0| 76 69 6e 67 20 74 68 65 | 20 61 6c 69 67 6e 6d 65 |ving the| alignme|
|00003fe0| 6e 74 20 6f 66 20 74 61 | 62 73 74 6f 70 73 2e 0a |nt of ta|bstops..|
|00003ff0| 2a 20 50 61 67 69 6e 61 | 74 69 6f 6e 3a 3a 09 09 |* Pagina|tion::..|
|00004000| 50 61 67 65 20 6e 75 6d | 62 65 72 69 6e 67 20 61 |Page num|bering a|
|00004010| 6e 64 20 74 69 6d 65 73 | 74 61 6d 70 69 6e 67 20 |nd times|tamping |
|00004020| 60 64 69 66 66 27 20 6f | 75 74 70 75 74 2e 0a 0a |`diff' o|utput...|
|00004030| 1f 0a 46 69 6c 65 3a 20 | 64 69 66 66 2e 69 6e 66 |..File: |diff.inf|
|00004040| 6f 2c 20 20 4e 6f 64 65 | 3a 20 54 61 62 73 2c 20 |o, Node|: Tabs, |
|00004050| 20 4e 65 78 74 3a 20 50 | 61 67 69 6e 61 74 69 6f | Next: P|aginatio|
|00004060| 6e 2c 20 20 55 70 3a 20 | 41 64 6a 75 73 74 69 6e |n, Up: |Adjustin|
|00004070| 67 20 4f 75 74 70 75 74 | 0a 0a 50 72 65 73 65 72 |g Output|..Preser|
|00004080| 76 69 6e 67 20 54 61 62 | 73 74 6f 70 20 41 6c 69 |ving Tab|stop Ali|
|00004090| 67 6e 6d 65 6e 74 0a 3d | 3d 3d 3d 3d 3d 3d 3d 3d |gnment.=|========|
|000040a0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000040b0| 3d 3d 3d 0a 0a 20 20 20 | 54 68 65 20 6c 69 6e 65 |===.. |The line|
|000040c0| 73 20 6f 66 20 74 65 78 | 74 20 69 6e 20 73 6f 6d |s of tex|t in som|
|000040d0| 65 20 6f 66 20 74 68 65 | 20 60 64 69 66 66 27 20 |e of the| `diff' |
|000040e0| 6f 75 74 70 75 74 20 66 | 6f 72 6d 61 74 73 20 61 |output f|ormats a|
|000040f0| 72 65 20 70 72 65 63 65 | 64 65 64 0a 62 79 20 6f |re prece|ded.by o|
|00004100| 6e 65 20 6f 72 20 74 77 | 6f 20 63 68 61 72 61 63 |ne or tw|o charac|
|00004110| 74 65 72 73 20 74 68 61 | 74 20 69 6e 64 69 63 61 |ters tha|t indica|
|00004120| 74 65 20 77 68 65 74 68 | 65 72 20 74 68 65 20 74 |te wheth|er the t|
|00004130| 65 78 74 20 69 73 20 69 | 6e 73 65 72 74 65 64 2c |ext is i|nserted,|
|00004140| 0a 64 65 6c 65 74 65 64 | 2c 20 6f 72 20 63 68 61 |.deleted|, or cha|
|00004150| 6e 67 65 64 2e 20 20 54 | 68 65 20 61 64 64 69 74 |nged. T|he addit|
|00004160| 69 6f 6e 20 6f 66 20 74 | 68 6f 73 65 20 63 68 61 |ion of t|hose cha|
|00004170| 72 61 63 74 65 72 73 20 | 63 61 6e 20 63 61 75 73 |racters |can caus|
|00004180| 65 20 74 61 62 73 20 74 | 6f 0a 6d 6f 76 65 20 74 |e tabs t|o.move t|
|00004190| 6f 20 74 68 65 20 6e 65 | 78 74 20 74 61 62 73 74 |o the ne|xt tabst|
|000041a0| 6f 70 2c 20 74 68 72 6f | 77 69 6e 67 20 6f 66 66 |op, thro|wing off|
|000041b0| 20 74 68 65 20 61 6c 69 | 67 6e 6d 65 6e 74 20 6f | the ali|gnment o|
|000041c0| 66 20 63 6f 6c 75 6d 6e | 73 20 69 6e 20 74 68 65 |f column|s in the|
|000041d0| 0a 6c 69 6e 65 2e 20 20 | 47 4e 55 20 60 64 69 66 |.line. |GNU `dif|
|000041e0| 66 27 20 70 72 6f 76 69 | 64 65 73 20 74 77 6f 20 |f' provi|des two |
|000041f0| 77 61 79 73 20 74 6f 20 | 6d 61 6b 65 20 74 61 62 |ways to |make tab|
|00004200| 2d 61 6c 69 67 6e 65 64 | 20 63 6f 6c 75 6d 6e 73 |-aligned| columns|
|00004210| 20 6c 69 6e 65 20 75 70 | 0a 63 6f 72 72 65 63 74 | line up|.correct|
|00004220| 6c 79 2e 0a 0a 20 20 20 | 54 68 65 20 66 69 72 73 |ly... |The firs|
|00004230| 74 20 77 61 79 20 69 73 | 20 74 6f 20 68 61 76 65 |t way is| to have|
|00004240| 20 60 64 69 66 66 27 20 | 63 6f 6e 76 65 72 74 20 | `diff' |convert |
|00004250| 61 6c 6c 20 74 61 62 73 | 20 69 6e 74 6f 20 74 68 |all tabs| into th|
|00004260| 65 20 63 6f 72 72 65 63 | 74 0a 6e 75 6d 62 65 72 |e correc|t.number|
|00004270| 20 6f 66 20 73 70 61 63 | 65 73 20 62 65 66 6f 72 | of spac|es befor|
|00004280| 65 20 6f 75 74 70 75 74 | 74 69 6e 67 20 74 68 65 |e output|ting the|
|00004290| 6d 3b 20 73 65 6c 65 63 | 74 20 74 68 69 73 20 6d |m; selec|t this m|
|000042a0| 65 74 68 6f 64 20 77 69 | 74 68 20 74 68 65 0a 60 |ethod wi|th the.`|
|000042b0| 2d 74 27 20 6f 72 20 60 | 2d 2d 65 78 70 61 6e 64 |-t' or `|--expand|
|000042c0| 2d 74 61 62 73 27 20 6f | 70 74 69 6f 6e 2e 20 20 |-tabs' o|ption. |
|000042d0| 60 64 69 66 66 27 20 61 | 73 73 75 6d 65 73 20 74 |`diff' a|ssumes t|
|000042e0| 68 61 74 20 74 61 62 73 | 74 6f 70 73 20 61 72 65 |hat tabs|tops are|
|000042f0| 20 73 65 74 0a 65 76 65 | 72 79 20 38 20 63 6f 6c | set.eve|ry 8 col|
|00004300| 75 6d 6e 73 2e 20 20 54 | 6f 20 75 73 65 20 74 68 |umns. T|o use th|
|00004310| 69 73 20 66 6f 72 6d 20 | 6f 66 20 6f 75 74 70 75 |is form |of outpu|
|00004320| 74 20 77 69 74 68 20 60 | 70 61 74 63 68 27 2c 20 |t with `|patch', |
|00004330| 79 6f 75 20 6d 75 73 74 | 0a 67 69 76 65 20 60 70 |you must|.give `p|
|00004340| 61 74 63 68 27 20 74 68 | 65 20 60 2d 6c 27 20 6f |atch' th|e `-l' o|
|00004350| 72 20 60 2d 2d 69 67 6e | 6f 72 65 2d 77 68 69 74 |r `--ign|ore-whit|
|00004360| 65 2d 73 70 61 63 65 27 | 20 6f 70 74 69 6f 6e 20 |e-space'| option |
|00004370| 28 2a 6e 6f 74 65 20 43 | 68 61 6e 67 65 64 0a 57 |(*note C|hanged.W|
|00004380| 68 69 74 65 20 53 70 61 | 63 65 3a 3a 2e 2c 20 66 |hite Spa|ce::., f|
|00004390| 6f 72 20 6d 6f 72 65 20 | 69 6e 66 6f 72 6d 61 74 |or more |informat|
|000043a0| 69 6f 6e 29 2e 0a 0a 20 | 20 20 54 68 65 20 6f 74 |ion)... | The ot|
|000043b0| 68 65 72 20 6d 65 74 68 | 6f 64 20 66 6f 72 20 6d |her meth|od for m|
|000043c0| 61 6b 69 6e 67 20 74 61 | 62 73 20 6c 69 6e 65 20 |aking ta|bs line |
|000043d0| 75 70 20 63 6f 72 72 65 | 63 74 6c 79 20 69 73 20 |up corre|ctly is |
|000043e0| 74 6f 20 61 64 64 20 61 | 20 74 61 62 0a 63 68 61 |to add a| tab.cha|
|000043f0| 72 61 63 74 65 72 20 69 | 6e 73 74 65 61 64 20 6f |racter i|nstead o|
|00004400| 66 20 61 20 73 70 61 63 | 65 20 61 66 74 65 72 20 |f a spac|e after |
|00004410| 74 68 65 20 69 6e 64 69 | 63 61 74 6f 72 20 63 68 |the indi|cator ch|
|00004420| 61 72 61 63 74 65 72 20 | 61 74 20 74 68 65 0a 62 |aracter |at the.b|
|00004430| 65 67 69 6e 6e 69 6e 67 | 20 6f 66 20 74 68 65 20 |eginning| of the |
|00004440| 6c 69 6e 65 2e 20 20 54 | 68 69 73 20 65 6e 73 75 |line. T|his ensu|
|00004450| 72 65 73 20 74 68 61 74 | 20 61 6c 6c 20 66 6f 6c |res that| all fol|
|00004460| 6c 6f 77 69 6e 67 20 74 | 61 62 20 63 68 61 72 61 |lowing t|ab chara|
|00004470| 63 74 65 72 73 0a 61 72 | 65 20 69 6e 20 74 68 65 |cters.ar|e in the|
|00004480| 20 73 61 6d 65 20 70 6f | 73 69 74 69 6f 6e 20 72 | same po|sition r|
|00004490| 65 6c 61 74 69 76 65 20 | 74 6f 20 74 61 62 73 74 |elative |to tabst|
|000044a0| 6f 70 73 20 74 68 61 74 | 20 74 68 65 79 20 77 65 |ops that| they we|
|000044b0| 72 65 20 69 6e 20 74 68 | 65 0a 6f 72 69 67 69 6e |re in th|e.origin|
|000044c0| 61 6c 20 66 69 6c 65 73 | 2c 20 73 6f 20 74 68 61 |al files|, so tha|
|000044d0| 74 20 74 68 65 20 6f 75 | 74 70 75 74 20 69 73 20 |t the ou|tput is |
|000044e0| 61 6c 69 67 6e 65 64 20 | 63 6f 72 72 65 63 74 6c |aligned |correctl|
|000044f0| 79 2e 20 20 49 74 73 0a | 64 69 73 61 64 76 61 6e |y. Its.|disadvan|
|00004500| 74 61 67 65 20 69 73 20 | 74 68 61 74 20 69 74 20 |tage is |that it |
|00004510| 63 61 6e 20 6d 61 6b 65 | 20 6c 6f 6e 67 20 6c 69 |can make| long li|
|00004520| 6e 65 73 20 74 6f 6f 20 | 6c 6f 6e 67 20 74 6f 20 |nes too |long to |
|00004530| 66 69 74 20 6f 6e 20 6f | 6e 65 20 6c 69 6e 65 0a |fit on o|ne line.|
|00004540| 6f 66 20 74 68 65 20 73 | 63 72 65 65 6e 20 6f 72 |of the s|creen or|
|00004550| 20 74 68 65 20 70 61 70 | 65 72 2e 20 20 49 74 20 | the pap|er. It |
|00004560| 61 6c 73 6f 20 64 6f 65 | 73 20 6e 6f 74 20 77 6f |also doe|s not wo|
|00004570| 72 6b 20 77 69 74 68 20 | 74 68 65 20 75 6e 69 66 |rk with |the unif|
|00004580| 69 65 64 0a 6f 75 74 70 | 75 74 20 66 6f 72 6d 61 |ied.outp|ut forma|
|00004590| 74 2c 20 77 68 69 63 68 | 20 64 6f 65 73 20 6e 6f |t, which| does no|
|000045a0| 74 20 68 61 76 65 20 61 | 20 73 70 61 63 65 20 63 |t have a| space c|
|000045b0| 68 61 72 61 63 74 65 72 | 20 61 66 74 65 72 20 74 |haracter| after t|
|000045c0| 68 65 20 63 68 61 6e 67 | 65 0a 74 79 70 65 20 69 |he chang|e.type i|
|000045d0| 6e 64 69 63 61 74 6f 72 | 20 63 68 61 72 61 63 74 |ndicator| charact|
|000045e0| 65 72 2e 20 20 53 65 6c | 65 63 74 20 74 68 69 73 |er. Sel|ect this|
|000045f0| 20 6d 65 74 68 6f 64 20 | 77 69 74 68 20 74 68 65 | method |with the|
|00004600| 20 60 2d 54 27 20 6f 72 | 0a 60 2d 2d 69 6e 69 74 | `-T' or|.`--init|
|00004610| 69 61 6c 2d 74 61 62 27 | 20 6f 70 74 69 6f 6e 2e |ial-tab'| option.|
|00004620| 0a 0a 1f 0a 46 69 6c 65 | 3a 20 64 69 66 66 2e 69 |....File|: diff.i|
|00004630| 6e 66 6f 2c 20 20 4e 6f | 64 65 3a 20 50 61 67 69 |nfo, No|de: Pagi|
|00004640| 6e 61 74 69 6f 6e 2c 20 | 20 50 72 65 76 3a 20 54 |nation, | Prev: T|
|00004650| 61 62 73 2c 20 20 55 70 | 3a 20 41 64 6a 75 73 74 |abs, Up|: Adjust|
|00004660| 69 6e 67 20 4f 75 74 70 | 75 74 0a 0a 50 61 67 69 |ing Outp|ut..Pagi|
|00004670| 6e 61 74 69 6e 67 20 60 | 64 69 66 66 27 20 4f 75 |nating `|diff' Ou|
|00004680| 74 70 75 74 0a 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |tput.===|========|
|00004690| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 0a 0a 20 |========|=====.. |
|000046a0| 20 20 49 74 20 63 61 6e | 20 62 65 20 63 6f 6e 76 | It can| be conv|
|000046b0| 65 6e 69 65 6e 74 20 74 | 6f 20 68 61 76 65 20 6c |enient t|o have l|
|000046c0| 6f 6e 67 20 6f 75 74 70 | 75 74 20 70 61 67 65 2d |ong outp|ut page-|
|000046d0| 6e 75 6d 62 65 72 65 64 | 20 61 6e 64 0a 74 69 6d |numbered| and.tim|
|000046e0| 65 2d 73 74 61 6d 70 65 | 64 2e 20 20 54 68 65 20 |e-stampe|d. The |
|000046f0| 60 2d 6c 27 20 61 6e 64 | 20 60 2d 2d 70 61 67 69 |`-l' and| `--pagi|
|00004700| 6e 61 74 65 27 20 6f 70 | 74 69 6f 6e 73 20 64 6f |nate' op|tions do|
|00004710| 20 74 68 69 73 20 62 79 | 20 73 65 6e 64 69 6e 67 | this by| sending|
|00004720| 20 74 68 65 0a 60 64 69 | 66 66 27 20 6f 75 74 70 | the.`di|ff' outp|
|00004730| 75 74 20 74 68 72 6f 75 | 67 68 20 74 68 65 20 60 |ut throu|gh the `|
|00004740| 70 72 27 20 70 72 6f 67 | 72 61 6d 2e 20 20 48 65 |pr' prog|ram. He|
|00004750| 72 65 20 69 73 20 77 68 | 61 74 20 74 68 65 20 70 |re is wh|at the p|
|00004760| 61 67 65 20 68 65 61 64 | 65 72 0a 6d 69 67 68 74 |age head|er.might|
|00004770| 20 6c 6f 6f 6b 20 6c 69 | 6b 65 20 66 6f 72 20 60 | look li|ke for `|
|00004780| 64 69 66 66 20 2d 6c 63 | 20 6c 61 6f 20 74 7a 75 |diff -lc| lao tzu|
|00004790| 27 3a 0a 0a 20 20 20 20 | 20 4d 61 72 20 31 31 20 |':.. | Mar 11 |
|000047a0| 31 33 3a 33 37 20 31 39 | 39 31 20 20 64 69 66 66 |13:37 19|91 diff|
|000047b0| 20 2d 6c 63 20 6c 61 6f | 20 74 7a 75 20 50 61 67 | -lc lao| tzu Pag|
|000047c0| 65 20 31 0a 0a 1f 0a 46 | 69 6c 65 3a 20 64 69 66 |e 1....F|ile: dif|
|000047d0| 66 2e 69 6e 66 6f 2c 20 | 20 4e 6f 64 65 3a 20 64 |f.info, | Node: d|
|000047e0| 69 66 66 20 50 65 72 66 | 6f 72 6d 61 6e 63 65 2c |iff Perf|ormance,|
|000047f0| 20 20 4e 65 78 74 3a 20 | 43 6f 6d 70 61 72 69 6e | Next: |Comparin|
|00004800| 67 20 54 68 72 65 65 20 | 46 69 6c 65 73 2c 20 20 |g Three |Files, |
|00004810| 50 72 65 76 3a 20 41 64 | 6a 75 73 74 69 6e 67 20 |Prev: Ad|justing |
|00004820| 4f 75 74 70 75 74 2c 20 | 20 55 70 3a 20 54 6f 70 |Output, | Up: Top|
|00004830| 0a 0a 60 64 69 66 66 27 | 20 50 65 72 66 6f 72 6d |..`diff'| Perform|
|00004840| 61 6e 63 65 20 54 72 61 | 64 65 6f 66 66 73 0a 2a |ance Tra|deoffs.*|
|00004850| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00004860| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 0a 0a 20 20 20 |********|***.. |
|00004870| 47 4e 55 20 60 64 69 66 | 66 27 20 72 75 6e 73 20 |GNU `dif|f' runs |
|00004880| 71 75 69 74 65 20 65 66 | 66 69 63 69 65 6e 74 6c |quite ef|ficientl|
|00004890| 79 3b 20 68 6f 77 65 76 | 65 72 2c 20 69 6e 20 73 |y; howev|er, in s|
|000048a0| 6f 6d 65 20 63 69 72 63 | 75 6d 73 74 61 6e 63 65 |ome circ|umstance|
|000048b0| 73 0a 79 6f 75 20 63 61 | 6e 20 63 61 75 73 65 20 |s.you ca|n cause |
|000048c0| 69 74 20 74 6f 20 72 75 | 6e 20 66 61 73 74 65 72 |it to ru|n faster|
|000048d0| 20 6f 72 20 70 72 6f 64 | 75 63 65 20 61 20 6d 6f | or prod|uce a mo|
|000048e0| 72 65 20 63 6f 6d 70 61 | 63 74 20 73 65 74 20 6f |re compa|ct set o|
|000048f0| 66 20 63 68 61 6e 67 65 | 73 2e 0a 54 68 65 72 65 |f change|s..There|
|00004900| 20 61 72 65 20 74 77 6f | 20 77 61 79 73 20 74 68 | are two| ways th|
|00004910| 61 74 20 79 6f 75 20 63 | 61 6e 20 61 66 66 65 63 |at you c|an affec|
|00004920| 74 20 74 68 65 20 70 65 | 72 66 6f 72 6d 61 6e 63 |t the pe|rformanc|
|00004930| 65 20 6f 66 20 47 4e 55 | 20 60 64 69 66 66 27 20 |e of GNU| `diff' |
|00004940| 62 79 0a 63 68 61 6e 67 | 69 6e 67 20 74 68 65 20 |by.chang|ing the |
|00004950| 77 61 79 20 69 74 20 63 | 6f 6d 70 61 72 65 73 20 |way it c|ompares |
|00004960| 66 69 6c 65 73 2e 0a 0a | 20 20 20 50 65 72 66 6f |files...| Perfo|
|00004970| 72 6d 61 6e 63 65 20 68 | 61 73 20 6d 6f 72 65 20 |rmance h|as more |
|00004980| 74 68 61 6e 20 6f 6e 65 | 20 64 69 6d 65 6e 73 69 |than one| dimensi|
|00004990| 6f 6e 2e 20 20 54 68 65 | 73 65 20 6f 70 74 69 6f |on. The|se optio|
|000049a0| 6e 73 20 69 6d 70 72 6f | 76 65 20 6f 6e 65 0a 61 |ns impro|ve one.a|
|000049b0| 73 70 65 63 74 20 6f 66 | 20 70 65 72 66 6f 72 6d |spect of| perform|
|000049c0| 61 6e 63 65 20 61 74 20 | 74 68 65 20 63 6f 73 74 |ance at |the cost|
|000049d0| 20 6f 66 20 61 6e 6f 74 | 68 65 72 2c 20 6f 72 20 | of anot|her, or |
|000049e0| 74 68 65 79 20 69 6d 70 | 72 6f 76 65 0a 70 65 72 |they imp|rove.per|
|000049f0| 66 6f 72 6d 61 6e 63 65 | 20 69 6e 20 73 6f 6d 65 |formance| in some|
|00004a00| 20 63 61 73 65 73 20 77 | 68 69 6c 65 20 68 75 72 | cases w|hile hur|
|00004a10| 74 69 6e 67 20 69 74 20 | 69 6e 20 6f 74 68 65 72 |ting it |in other|
|00004a20| 73 2e 0a 0a 20 20 20 54 | 68 65 20 77 61 79 20 74 |s... T|he way t|
|00004a30| 68 61 74 20 47 4e 55 20 | 60 64 69 66 66 27 20 64 |hat GNU |`diff' d|
|00004a40| 65 74 65 72 6d 69 6e 65 | 73 20 77 68 69 63 68 20 |etermine|s which |
|00004a50| 6c 69 6e 65 73 20 68 61 | 76 65 20 63 68 61 6e 67 |lines ha|ve chang|
|00004a60| 65 64 20 61 6c 77 61 79 | 73 0a 63 6f 6d 65 73 20 |ed alway|s.comes |
|00004a70| 75 70 20 77 69 74 68 20 | 61 20 6e 65 61 72 2d 6d |up with |a near-m|
|00004a80| 69 6e 69 6d 61 6c 20 73 | 65 74 20 6f 66 20 64 69 |inimal s|et of di|
|00004a90| 66 66 65 72 65 6e 63 65 | 73 2e 20 20 55 73 75 61 |fference|s. Usua|
|00004aa0| 6c 6c 79 20 69 74 20 69 | 73 20 67 6f 6f 64 0a 65 |lly it i|s good.e|
|00004ab0| 6e 6f 75 67 68 20 66 6f | 72 20 70 72 61 63 74 69 |nough fo|r practi|
|00004ac0| 63 61 6c 20 70 75 72 70 | 6f 73 65 73 2e 20 20 49 |cal purp|oses. I|
|00004ad0| 66 20 74 68 65 20 60 64 | 69 66 66 27 20 6f 75 74 |f the `d|iff' out|
|00004ae0| 70 75 74 20 69 73 20 6c | 61 72 67 65 2c 20 79 6f |put is l|arge, yo|
|00004af0| 75 0a 6d 69 67 68 74 20 | 77 61 6e 74 20 60 64 69 |u.might |want `di|
|00004b00| 66 66 27 20 74 6f 20 75 | 73 65 20 61 20 6d 6f 64 |ff' to u|se a mod|
|00004b10| 69 66 69 65 64 20 61 6c | 67 6f 72 69 74 68 6d 20 |ified al|gorithm |
|00004b20| 74 68 61 74 20 73 6f 6d | 65 74 69 6d 65 73 20 70 |that som|etimes p|
|00004b30| 72 6f 64 75 63 65 73 20 | 61 0a 73 6d 61 6c 6c 65 |roduces |a.smalle|
|00004b40| 72 20 73 65 74 20 6f 66 | 20 64 69 66 66 65 72 65 |r set of| differe|
|00004b50| 6e 63 65 73 2e 20 20 54 | 68 65 20 60 2d 64 27 20 |nces. T|he `-d' |
|00004b60| 6f 72 20 60 2d 2d 6d 69 | 6e 69 6d 61 6c 27 20 6f |or `--mi|nimal' o|
|00004b70| 70 74 69 6f 6e 20 64 6f | 65 73 20 74 68 69 73 3b |ption do|es this;|
|00004b80| 0a 68 6f 77 65 76 65 72 | 2c 20 69 74 20 63 61 6e |.however|, it can|
|00004b90| 20 61 6c 73 6f 20 63 61 | 75 73 65 20 60 64 69 66 | also ca|use `dif|
|00004ba0| 66 27 20 74 6f 20 72 75 | 6e 20 6d 6f 72 65 20 73 |f' to ru|n more s|
|00004bb0| 6c 6f 77 6c 79 20 74 68 | 61 6e 20 75 73 75 61 6c |lowly th|an usual|
|00004bc0| 2c 20 73 6f 20 69 74 0a | 69 73 20 6e 6f 74 20 74 |, so it.|is not t|
|00004bd0| 68 65 20 64 65 66 61 75 | 6c 74 20 62 65 68 61 76 |he defau|lt behav|
|00004be0| 69 6f 72 2e 0a 0a 20 20 | 20 57 68 65 6e 20 74 68 |ior... | When th|
|00004bf0| 65 20 66 69 6c 65 73 20 | 79 6f 75 20 61 72 65 20 |e files |you are |
|00004c00| 63 6f 6d 70 61 72 69 6e | 67 20 61 72 65 20 6c 61 |comparin|g are la|
|00004c10| 72 67 65 20 61 6e 64 20 | 68 61 76 65 20 73 6d 61 |rge and |have sma|
|00004c20| 6c 6c 20 67 72 6f 75 70 | 73 20 6f 66 0a 63 68 61 |ll group|s of.cha|
|00004c30| 6e 67 65 73 20 73 63 61 | 74 74 65 72 65 64 20 74 |nges sca|ttered t|
|00004c40| 68 72 6f 75 67 68 6f 75 | 74 20 74 68 65 6d 2c 20 |hroughou|t them, |
|00004c50| 79 6f 75 20 63 61 6e 20 | 75 73 65 20 74 68 65 20 |you can |use the |
|00004c60| 60 2d 48 27 20 6f 72 0a | 60 2d 2d 73 70 65 65 64 |`-H' or.|`--speed|
|00004c70| 2d 6c 61 72 67 65 2d 66 | 69 6c 65 73 27 20 6f 70 |-large-f|iles' op|
|00004c80| 74 69 6f 6e 20 74 6f 20 | 6d 61 6b 65 20 61 20 64 |tion to |make a d|
|00004c90| 69 66 66 65 72 65 6e 74 | 20 6d 6f 64 69 66 69 63 |ifferent| modific|
|00004ca0| 61 74 69 6f 6e 20 74 6f | 20 74 68 65 0a 61 6c 67 |ation to| the.alg|
|00004cb0| 6f 72 69 74 68 6d 20 74 | 68 61 74 20 60 64 69 66 |orithm t|hat `dif|
|00004cc0| 66 27 20 75 73 65 73 2e | 20 20 49 66 20 74 68 65 |f' uses.| If the|
|00004cd0| 20 69 6e 70 75 74 20 66 | 69 6c 65 73 20 68 61 76 | input f|iles hav|
|00004ce0| 65 20 61 20 63 6f 6e 73 | 74 61 6e 74 20 73 6d 61 |e a cons|tant sma|
|00004cf0| 6c 6c 0a 64 65 6e 73 69 | 74 79 20 6f 66 20 63 68 |ll.densi|ty of ch|
|00004d00| 61 6e 67 65 73 2c 20 74 | 68 69 73 20 6f 70 74 69 |anges, t|his opti|
|00004d10| 6f 6e 20 73 70 65 65 64 | 73 20 75 70 20 74 68 65 |on speed|s up the|
|00004d20| 20 63 6f 6d 70 61 72 69 | 73 6f 6e 73 20 77 69 74 | compari|sons wit|
|00004d30| 68 6f 75 74 0a 63 68 61 | 6e 67 69 6e 67 20 74 68 |hout.cha|nging th|
|00004d40| 65 20 6f 75 74 70 75 74 | 2e 20 20 49 66 20 6e 6f |e output|. If no|
|00004d50| 74 2c 20 60 64 69 66 66 | 27 20 6d 69 67 68 74 20 |t, `diff|' might |
|00004d60| 70 72 6f 64 75 63 65 20 | 61 20 6c 61 72 67 65 72 |produce |a larger|
|00004d70| 20 73 65 74 20 6f 66 0a | 64 69 66 66 65 72 65 6e | set of.|differen|
|00004d80| 63 65 73 3b 20 68 6f 77 | 65 76 65 72 2c 20 74 68 |ces; how|ever, th|
|00004d90| 65 20 6f 75 74 70 75 74 | 20 77 69 6c 6c 20 73 74 |e output| will st|
|00004da0| 69 6c 6c 20 62 65 20 63 | 6f 72 72 65 63 74 2e 0a |ill be c|orrect..|
|00004db0| 0a 20 20 20 4e 6f 72 6d | 61 6c 6c 79 20 60 64 69 |. Norm|ally `di|
|00004dc0| 66 66 27 20 64 69 73 63 | 61 72 64 73 20 74 68 65 |ff' disc|ards the|
|00004dd0| 20 70 72 65 66 69 78 20 | 61 6e 64 20 73 75 66 66 | prefix |and suff|
|00004de0| 69 78 20 74 68 61 74 20 | 69 73 20 63 6f 6d 6d 6f |ix that |is commo|
|00004df0| 6e 20 74 6f 0a 62 6f 74 | 68 20 66 69 6c 65 73 20 |n to.bot|h files |
|00004e00| 62 65 66 6f 72 65 20 69 | 74 20 61 74 74 65 6d 70 |before i|t attemp|
|00004e10| 74 73 20 74 6f 20 66 69 | 6e 64 20 61 20 6d 69 6e |ts to fi|nd a min|
|00004e20| 69 6d 61 6c 20 73 65 74 | 20 6f 66 20 64 69 66 66 |imal set| of diff|
|00004e30| 65 72 65 6e 63 65 73 2e | 0a 54 68 69 73 20 6d 61 |erences.|.This ma|
|00004e40| 6b 65 73 20 60 64 69 66 | 66 27 20 72 75 6e 20 66 |kes `dif|f' run f|
|00004e50| 61 73 74 65 72 2c 20 62 | 75 74 20 6f 63 63 61 73 |aster, b|ut occas|
|00004e60| 69 6f 6e 61 6c 6c 79 20 | 69 74 20 6d 61 79 20 70 |ionally |it may p|
|00004e70| 72 6f 64 75 63 65 0a 6e | 6f 6e 2d 6d 69 6e 69 6d |roduce.n|on-minim|
|00004e80| 61 6c 20 6f 75 74 70 75 | 74 2e 20 20 54 68 65 20 |al outpu|t. The |
|00004e90| 60 2d 2d 68 6f 72 69 7a | 6f 6e 2d 6c 69 6e 65 73 |`--horiz|on-lines|
|00004ea0| 3d 4c 49 4e 45 53 27 20 | 6f 70 74 69 6f 6e 20 70 |=LINES' |option p|
|00004eb0| 72 65 76 65 6e 74 73 20 | 60 64 69 66 66 27 0a 66 |revents |`diff'.f|
|00004ec0| 72 6f 6d 20 64 69 73 63 | 61 72 64 69 6e 67 20 74 |rom disc|arding t|
|00004ed0| 68 65 20 6c 61 73 74 20 | 4c 49 4e 45 53 20 6c 69 |he last |LINES li|
|00004ee0| 6e 65 73 20 6f 66 20 74 | 68 65 20 70 72 65 66 69 |nes of t|he prefi|
|00004ef0| 78 20 61 6e 64 20 74 68 | 65 20 66 69 72 73 74 20 |x and th|e first |
|00004f00| 4c 49 4e 45 53 0a 6c 69 | 6e 65 73 20 6f 66 20 74 |LINES.li|nes of t|
|00004f10| 68 65 20 73 75 66 66 69 | 78 2e 20 20 54 68 69 73 |he suffi|x. This|
|00004f20| 20 67 69 76 65 73 20 60 | 64 69 66 66 27 20 66 75 | gives `|diff' fu|
|00004f30| 72 74 68 65 72 20 6f 70 | 70 6f 72 74 75 6e 69 74 |rther op|portunit|
|00004f40| 69 65 73 20 74 6f 20 66 | 69 6e 64 20 61 0a 6d 69 |ies to f|ind a.mi|
|00004f50| 6e 69 6d 61 6c 20 6f 75 | 74 70 75 74 2e 0a 0a 1f |nimal ou|tput....|
|00004f60| 0a 46 69 6c 65 3a 20 64 | 69 66 66 2e 69 6e 66 6f |.File: d|iff.info|
|00004f70| 2c 20 20 4e 6f 64 65 3a | 20 43 6f 6d 70 61 72 69 |, Node:| Compari|
|00004f80| 6e 67 20 54 68 72 65 65 | 20 46 69 6c 65 73 2c 20 |ng Three| Files, |
|00004f90| 20 4e 65 78 74 3a 20 64 | 69 66 66 33 20 4d 65 72 | Next: d|iff3 Mer|
|00004fa0| 67 69 6e 67 2c 20 20 50 | 72 65 76 3a 20 64 69 66 |ging, P|rev: dif|
|00004fb0| 66 20 50 65 72 66 6f 72 | 6d 61 6e 63 65 2c 20 20 |f Perfor|mance, |
|00004fc0| 55 70 3a 20 54 6f 70 0a | 0a 43 6f 6d 70 61 72 69 |Up: Top.|.Compari|
|00004fd0| 6e 67 20 54 68 72 65 65 | 20 46 69 6c 65 73 0a 2a |ng Three| Files.*|
|00004fe0| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00004ff0| 2a 2a 2a 2a 0a 0a 20 20 | 20 55 73 65 20 74 68 65 |****.. | Use the|
|00005000| 20 70 72 6f 67 72 61 6d | 20 60 64 69 66 66 33 27 | program| `diff3'|
|00005010| 20 74 6f 20 63 6f 6d 70 | 61 72 65 20 74 68 72 65 | to comp|are thre|
|00005020| 65 20 66 69 6c 65 73 20 | 61 6e 64 20 73 68 6f 77 |e files |and show|
|00005030| 20 61 6e 79 0a 64 69 66 | 66 65 72 65 6e 63 65 73 | any.dif|ferences|
|00005040| 20 61 6d 6f 6e 67 20 74 | 68 65 6d 2e 20 20 28 60 | among t|hem. (`|
|00005050| 64 69 66 66 33 27 20 63 | 61 6e 20 61 6c 73 6f 20 |diff3' c|an also |
|00005060| 6d 65 72 67 65 20 66 69 | 6c 65 73 3b 20 73 65 65 |merge fi|les; see|
|00005070| 20 2a 4e 6f 74 65 20 64 | 69 66 66 33 0a 4d 65 72 | *Note d|iff3.Mer|
|00005080| 67 69 6e 67 3a 3a 29 2e | 0a 0a 20 20 20 54 68 65 |ging::).|.. The|
|00005090| 20 22 6e 6f 72 6d 61 6c | 22 20 60 64 69 66 66 33 | "normal|" `diff3|
|000050a0| 27 20 6f 75 74 70 75 74 | 20 66 6f 72 6d 61 74 20 |' output| format |
|000050b0| 73 68 6f 77 73 20 65 61 | 63 68 20 68 75 6e 6b 20 |shows ea|ch hunk |
|000050c0| 6f 66 20 64 69 66 66 65 | 72 65 6e 63 65 73 0a 77 |of diffe|rences.w|
|000050d0| 69 74 68 6f 75 74 20 73 | 75 72 72 6f 75 6e 64 69 |ithout s|urroundi|
|000050e0| 6e 67 20 63 6f 6e 74 65 | 78 74 2e 20 20 48 75 6e |ng conte|xt. Hun|
|000050f0| 6b 73 20 61 72 65 20 6c | 61 62 65 6c 65 64 20 64 |ks are l|abeled d|
|00005100| 65 70 65 6e 64 69 6e 67 | 20 6f 6e 20 77 68 65 74 |epending| on whet|
|00005110| 68 65 72 0a 74 68 65 79 | 20 61 72 65 20 74 77 6f |her.they| are two|
|00005120| 2d 77 61 79 20 6f 72 20 | 74 68 72 65 65 2d 77 61 |-way or |three-wa|
|00005130| 79 2c 20 61 6e 64 20 6c | 69 6e 65 73 20 61 72 65 |y, and l|ines are|
|00005140| 20 61 6e 6e 6f 74 61 74 | 65 64 20 62 79 20 74 68 | annotat|ed by th|
|00005150| 65 69 72 0a 6c 6f 63 61 | 74 69 6f 6e 20 69 6e 20 |eir.loca|tion in |
|00005160| 74 68 65 20 69 6e 70 75 | 74 20 66 69 6c 65 73 2e |the inpu|t files.|
|00005170| 0a 0a 20 20 20 2a 4e 6f | 74 65 20 49 6e 76 6f 6b |.. *No|te Invok|
|00005180| 69 6e 67 20 64 69 66 66 | 33 3a 3a 2c 20 66 6f 72 |ing diff|3::, for|
|00005190| 20 6d 6f 72 65 20 69 6e | 66 6f 72 6d 61 74 69 6f | more in|formatio|
|000051a0| 6e 20 6f 6e 20 68 6f 77 | 20 74 6f 20 72 75 6e 20 |n on how| to run |
|000051b0| 60 64 69 66 66 33 27 2e | 0a 0a 2a 20 4d 65 6e 75 |`diff3'.|..* Menu|
|000051c0| 3a 0a 0a 2a 20 53 61 6d | 70 6c 65 20 64 69 66 66 |:..* Sam|ple diff|
|000051d0| 33 20 49 6e 70 75 74 3a | 3a 09 09 53 61 6d 70 6c |3 Input:|:..Sampl|
|000051e0| 65 20 60 64 69 66 66 33 | 27 20 69 6e 70 75 74 20 |e `diff3|' input |
|000051f0| 66 6f 72 20 65 78 61 6d | 70 6c 65 73 2e 0a 2a 20 |for exam|ples..* |
|00005200| 44 65 74 61 69 6c 65 64 | 20 64 69 66 66 33 20 4e |Detailed| diff3 N|
|00005210| 6f 72 6d 61 6c 3a 3a 09 | 41 20 64 65 74 61 69 6c |ormal::.|A detail|
|00005220| 65 64 20 64 65 73 63 72 | 69 70 74 69 6f 6e 20 6f |ed descr|iption o|
|00005230| 66 20 6e 6f 72 6d 61 6c | 20 6f 75 74 70 75 74 20 |f normal| output |
|00005240| 66 6f 72 6d 61 74 2e 0a | 2a 20 64 69 66 66 33 20 |format..|* diff3 |
|00005250| 48 75 6e 6b 73 3a 3a 09 | 09 09 54 68 65 20 66 6f |Hunks::.|..The fo|
|00005260| 72 6d 61 74 20 6f 66 20 | 6e 6f 72 6d 61 6c 20 6f |rmat of |normal o|
|00005270| 75 74 70 75 74 20 66 6f | 72 6d 61 74 2e 0a 2a 20 |utput fo|rmat..* |
|00005280| 45 78 61 6d 70 6c 65 20 | 64 69 66 66 33 20 4e 6f |Example |diff3 No|
|00005290| 72 6d 61 6c 3a 3a 09 53 | 61 6d 70 6c 65 20 6f 75 |rmal::.S|ample ou|
|000052a0| 74 70 75 74 20 69 6e 20 | 74 68 65 20 6e 6f 72 6d |tput in |the norm|
|000052b0| 61 6c 20 66 6f 72 6d 61 | 74 2e 0a 0a 1f 0a 46 69 |al forma|t.....Fi|
|000052c0| 6c 65 3a 20 64 69 66 66 | 2e 69 6e 66 6f 2c 20 20 |le: diff|.info, |
|000052d0| 4e 6f 64 65 3a 20 53 61 | 6d 70 6c 65 20 64 69 66 |Node: Sa|mple dif|
|000052e0| 66 33 20 49 6e 70 75 74 | 2c 20 20 4e 65 78 74 3a |f3 Input|, Next:|
|000052f0| 20 44 65 74 61 69 6c 65 | 64 20 64 69 66 66 33 20 | Detaile|d diff3 |
|00005300| 4e 6f 72 6d 61 6c 2c 20 | 20 55 70 3a 20 43 6f 6d |Normal, | Up: Com|
|00005310| 70 61 72 69 6e 67 20 54 | 68 72 65 65 20 46 69 6c |paring T|hree Fil|
|00005320| 65 73 0a 0a 41 20 54 68 | 69 72 64 20 53 61 6d 70 |es..A Th|ird Samp|
|00005330| 6c 65 20 49 6e 70 75 74 | 20 46 69 6c 65 0a 3d 3d |le Input| File.==|
|00005340| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005350| 3d 3d 3d 3d 3d 3d 3d 0a | 0a 20 20 20 48 65 72 65 |=======.|. Here|
|00005360| 20 69 73 20 61 20 74 68 | 69 72 64 20 73 61 6d 70 | is a th|ird samp|
|00005370| 6c 65 20 66 69 6c 65 20 | 74 68 61 74 20 77 69 6c |le file |that wil|
|00005380| 6c 20 62 65 20 75 73 65 | 64 20 69 6e 20 65 78 61 |l be use|d in exa|
|00005390| 6d 70 6c 65 73 20 74 6f | 0a 69 6c 6c 75 73 74 72 |mples to|.illustr|
|000053a0| 61 74 65 20 74 68 65 20 | 6f 75 74 70 75 74 20 6f |ate the |output o|
|000053b0| 66 20 60 64 69 66 66 33 | 27 20 61 6e 64 20 68 6f |f `diff3|' and ho|
|000053c0| 77 20 76 61 72 69 6f 75 | 73 20 6f 70 74 69 6f 6e |w variou|s option|
|000053d0| 73 20 63 61 6e 20 63 68 | 61 6e 67 65 20 69 74 2e |s can ch|ange it.|
|000053e0| 0a 54 68 65 20 66 69 72 | 73 74 20 74 77 6f 20 66 |.The fir|st two f|
|000053f0| 69 6c 65 73 20 61 72 65 | 20 74 68 65 20 73 61 6d |iles are| the sam|
|00005400| 65 20 74 68 61 74 20 77 | 65 20 75 73 65 64 20 66 |e that w|e used f|
|00005410| 6f 72 20 60 64 69 66 66 | 27 20 28 2a 6e 6f 74 65 |or `diff|' (*note|
|00005420| 20 53 61 6d 70 6c 65 0a | 64 69 66 66 20 49 6e 70 | Sample.|diff Inp|
|00005430| 75 74 3a 3a 2e 29 2e 20 | 20 54 68 69 73 20 69 73 |ut::.). | This is|
|00005440| 20 74 68 65 20 74 68 69 | 72 64 20 73 61 6d 70 6c | the thi|rd sampl|
|00005450| 65 20 66 69 6c 65 2c 20 | 63 61 6c 6c 65 64 20 60 |e file, |called `|
|00005460| 74 61 6f 27 3a 0a 0a 20 | 20 20 20 20 54 68 65 20 |tao':.. | The |
|00005470| 57 61 79 20 74 68 61 74 | 20 63 61 6e 20 62 65 20 |Way that| can be |
|00005480| 74 6f 6c 64 20 6f 66 20 | 69 73 20 6e 6f 74 20 74 |told of |is not t|
|00005490| 68 65 20 65 74 65 72 6e | 61 6c 20 57 61 79 3b 0a |he etern|al Way;.|
|000054a0| 20 20 20 20 20 54 68 65 | 20 6e 61 6d 65 20 74 68 | The| name th|
|000054b0| 61 74 20 63 61 6e 20 62 | 65 20 6e 61 6d 65 64 20 |at can b|e named |
|000054c0| 69 73 20 6e 6f 74 20 74 | 68 65 20 65 74 65 72 6e |is not t|he etern|
|000054d0| 61 6c 20 6e 61 6d 65 2e | 0a 20 20 20 20 20 54 68 |al name.|. Th|
|000054e0| 65 20 4e 61 6d 65 6c 65 | 73 73 20 69 73 20 74 68 |e Namele|ss is th|
|000054f0| 65 20 6f 72 69 67 69 6e | 20 6f 66 20 48 65 61 76 |e origin| of Heav|
|00005500| 65 6e 20 61 6e 64 20 45 | 61 72 74 68 3b 0a 20 20 |en and E|arth;. |
|00005510| 20 20 20 54 68 65 20 6e | 61 6d 65 64 20 69 73 20 | The n|amed is |
|00005520| 74 68 65 20 6d 6f 74 68 | 65 72 20 6f 66 20 61 6c |the moth|er of al|
|00005530| 6c 20 74 68 69 6e 67 73 | 2e 0a 20 20 20 20 20 0a |l things|.. .|
|00005540| 20 20 20 20 20 54 68 65 | 72 65 66 6f 72 65 20 6c | The|refore l|
|00005550| 65 74 20 74 68 65 72 65 | 20 61 6c 77 61 79 73 20 |et there| always |
|00005560| 62 65 20 6e 6f 6e 2d 62 | 65 69 6e 67 2c 0a 20 20 |be non-b|eing,. |
|00005570| 20 20 20 20 20 73 6f 20 | 77 65 20 6d 61 79 20 73 | so |we may s|
|00005580| 65 65 20 74 68 65 69 72 | 20 73 75 62 74 6c 65 74 |ee their| subtlet|
|00005590| 79 2c 0a 20 20 20 20 20 | 41 6e 64 20 6c 65 74 20 |y,. |And let |
|000055a0| 74 68 65 72 65 20 61 6c | 77 61 79 73 20 62 65 20 |there al|ways be |
|000055b0| 62 65 69 6e 67 2c 0a 20 | 20 20 20 20 20 20 73 6f |being,. | so|
|000055c0| 20 77 65 20 6d 61 79 20 | 73 65 65 20 74 68 65 69 | we may |see thei|
|000055d0| 72 20 72 65 73 75 6c 74 | 2e 0a 20 20 20 20 20 54 |r result|.. T|
|000055e0| 68 65 20 74 77 6f 20 61 | 72 65 20 74 68 65 20 73 |he two a|re the s|
|000055f0| 61 6d 65 2c 0a 20 20 20 | 20 20 42 75 74 20 61 66 |ame,. | But af|
|00005600| 74 65 72 20 74 68 65 79 | 20 61 72 65 20 70 72 6f |ter they| are pro|
|00005610| 64 75 63 65 64 2c 0a 20 | 20 20 20 20 20 20 74 68 |duced,. | th|
|00005620| 65 79 20 68 61 76 65 20 | 64 69 66 66 65 72 65 6e |ey have |differen|
|00005630| 74 20 6e 61 6d 65 73 2e | 0a 20 20 20 20 20 0a 20 |t names.|. . |
|00005640| 20 20 20 20 20 20 2d 2d | 20 54 68 65 20 57 61 79 | --| The Way|
|00005650| 20 6f 66 20 4c 61 6f 2d | 54 7a 75 2c 20 74 72 2e | of Lao-|Tzu, tr.|
|00005660| 20 57 69 6e 67 2d 74 73 | 69 74 20 43 68 61 6e 0a | Wing-ts|it Chan.|
|00005670| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|00005680| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 44 65 74 61 69 |fo, Nod|e: Detai|
|00005690| 6c 65 64 20 64 69 66 66 | 33 20 4e 6f 72 6d 61 6c |led diff|3 Normal|
|000056a0| 2c 20 20 4e 65 78 74 3a | 20 64 69 66 66 33 20 48 |, Next:| diff3 H|
|000056b0| 75 6e 6b 73 2c 20 20 50 | 72 65 76 3a 20 53 61 6d |unks, P|rev: Sam|
|000056c0| 70 6c 65 20 64 69 66 66 | 33 20 49 6e 70 75 74 2c |ple diff|3 Input,|
|000056d0| 20 20 55 70 3a 20 43 6f | 6d 70 61 72 69 6e 67 20 | Up: Co|mparing |
|000056e0| 54 68 72 65 65 20 46 69 | 6c 65 73 0a 0a 44 65 74 |Three Fi|les..Det|
|000056f0| 61 69 6c 65 64 20 44 65 | 73 63 72 69 70 74 69 6f |ailed De|scriptio|
|00005700| 6e 20 6f 66 20 60 64 69 | 66 66 33 27 20 4e 6f 72 |n of `di|ff3' Nor|
|00005710| 6d 61 6c 20 46 6f 72 6d | 61 74 0a 3d 3d 3d 3d 3d |mal Form|at.=====|
|00005720| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005730| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00005740| 3d 3d 3d 3d 3d 3d 3d 3d | 0a 0a 20 20 20 45 61 63 |========|.. Eac|
|00005750| 68 20 68 75 6e 6b 20 62 | 65 67 69 6e 73 20 77 69 |h hunk b|egins wi|
|00005760| 74 68 20 61 20 6c 69 6e | 65 20 6d 61 72 6b 65 64 |th a lin|e marked|
|00005770| 20 60 3d 3d 3d 3d 27 2e | 20 20 54 68 72 65 65 2d | `===='.| Three-|
|00005780| 77 61 79 20 68 75 6e 6b | 73 20 68 61 76 65 0a 70 |way hunk|s have.p|
|00005790| 6c 61 69 6e 20 60 3d 3d | 3d 3d 27 20 6c 69 6e 65 |lain `==|==' line|
|000057a0| 73 2c 20 61 6e 64 20 74 | 77 6f 2d 77 61 79 20 68 |s, and t|wo-way h|
|000057b0| 75 6e 6b 73 20 68 61 76 | 65 20 60 31 27 2c 20 60 |unks hav|e `1', `|
|000057c0| 32 27 2c 20 6f 72 20 60 | 33 27 20 61 70 70 65 6e |2', or `|3' appen|
|000057d0| 64 65 64 20 74 6f 0a 73 | 70 65 63 69 66 79 20 77 |ded to.s|pecify w|
|000057e0| 68 69 63 68 20 6f 66 20 | 74 68 65 20 74 68 72 65 |hich of |the thre|
|000057f0| 65 20 69 6e 70 75 74 20 | 66 69 6c 65 73 20 64 69 |e input |files di|
|00005800| 66 66 65 72 20 69 6e 20 | 74 68 61 74 20 68 75 6e |ffer in |that hun|
|00005810| 6b 2e 20 20 54 68 65 20 | 68 75 6e 6b 73 0a 63 6f |k. The |hunks.co|
|00005820| 6e 74 61 69 6e 20 63 6f | 70 69 65 73 20 6f 66 20 |ntain co|pies of |
|00005830| 74 77 6f 20 6f 72 20 74 | 68 72 65 65 20 73 65 74 |two or t|hree set|
|00005840| 73 20 6f 66 20 69 6e 70 | 75 74 20 6c 69 6e 65 73 |s of inp|ut lines|
|00005850| 20 65 61 63 68 20 70 72 | 65 63 65 64 65 64 20 62 | each pr|eceded b|
|00005860| 79 20 6f 6e 65 0a 6f 72 | 20 74 77 6f 20 63 6f 6d |y one.or| two com|
|00005870| 6d 61 6e 64 73 20 69 64 | 65 6e 74 69 66 79 69 6e |mands id|entifyin|
|00005880| 67 20 77 68 65 72 65 20 | 74 68 65 20 6c 69 6e 65 |g where |the line|
|00005890| 73 20 63 61 6d 65 20 66 | 72 6f 6d 2e 0a 0a 20 20 |s came f|rom... |
|000058a0| 20 4e 6f 72 6d 61 6c 6c | 79 2c 20 74 77 6f 20 73 | Normall|y, two s|
|000058b0| 70 61 63 65 73 20 70 72 | 65 63 65 64 65 20 65 61 |paces pr|ecede ea|
|000058c0| 63 68 20 63 6f 70 79 20 | 6f 66 20 61 6e 20 69 6e |ch copy |of an in|
|000058d0| 70 75 74 20 6c 69 6e 65 | 20 74 6f 0a 64 69 73 74 |put line| to.dist|
|000058e0| 69 6e 67 75 69 73 68 20 | 69 74 20 66 72 6f 6d 20 |inguish |it from |
|000058f0| 74 68 65 20 63 6f 6d 6d | 61 6e 64 73 2e 20 20 42 |the comm|ands. B|
|00005900| 75 74 20 77 69 74 68 20 | 74 68 65 20 60 2d 54 27 |ut with |the `-T'|
|00005910| 20 6f 72 20 60 2d 2d 69 | 6e 69 74 69 61 6c 2d 74 | or `--i|nitial-t|
|00005920| 61 62 27 0a 6f 70 74 69 | 6f 6e 2c 20 60 64 69 66 |ab'.opti|on, `dif|
|00005930| 66 33 27 20 75 73 65 73 | 20 61 20 74 61 62 20 69 |f3' uses| a tab i|
|00005940| 6e 73 74 65 61 64 20 6f | 66 20 74 77 6f 20 73 70 |nstead o|f two sp|
|00005950| 61 63 65 73 3b 20 74 68 | 69 73 20 6c 69 6e 65 73 |aces; th|is lines|
|00005960| 20 75 70 20 74 61 62 73 | 0a 63 6f 72 72 65 63 74 | up tabs|.correct|
|00005970| 6c 79 2e 20 20 2a 4e 6f | 74 65 20 54 61 62 73 3a |ly. *No|te Tabs:|
|00005980| 3a 2c 20 66 6f 72 20 6d | 6f 72 65 20 69 6e 66 6f |:, for m|ore info|
|00005990| 72 6d 61 74 69 6f 6e 2e | 0a 0a 20 20 20 43 6f 6d |rmation.|.. Com|
|000059a0| 6d 61 6e 64 73 20 74 61 | 6b 65 20 74 68 65 20 66 |mands ta|ke the f|
|000059b0| 6f 6c 6c 6f 77 69 6e 67 | 20 66 6f 72 6d 73 3a 0a |ollowing| forms:.|
|000059c0| 0a 60 46 49 4c 45 3a 4c | 61 27 0a 20 20 20 20 20 |.`FILE:L|a'. |
|000059d0| 54 68 69 73 20 68 75 6e | 6b 20 61 70 70 65 61 72 |This hun|k appear|
|000059e0| 73 20 61 66 74 65 72 20 | 6c 69 6e 65 20 4c 20 6f |s after |line L o|
|000059f0| 66 20 66 69 6c 65 20 46 | 49 4c 45 2c 20 61 6e 64 |f file F|ILE, and|
|00005a00| 20 63 6f 6e 74 61 69 6e | 73 20 6e 6f 20 6c 69 6e | contain|s no lin|
|00005a10| 65 73 0a 20 20 20 20 20 | 69 6e 20 74 68 61 74 20 |es. |in that |
|00005a20| 66 69 6c 65 2e 20 20 54 | 6f 20 65 64 69 74 20 74 |file. T|o edit t|
|00005a30| 68 69 73 20 66 69 6c 65 | 20 74 6f 20 79 69 65 6c |his file| to yiel|
|00005a40| 64 20 74 68 65 20 6f 74 | 68 65 72 20 66 69 6c 65 |d the ot|her file|
|00005a50| 73 2c 20 6f 6e 65 0a 20 | 20 20 20 20 6d 75 73 74 |s, one. | must|
|00005a60| 20 61 70 70 65 6e 64 20 | 68 75 6e 6b 20 6c 69 6e | append |hunk lin|
|00005a70| 65 73 20 74 61 6b 65 6e | 20 66 72 6f 6d 20 74 68 |es taken| from th|
|00005a80| 65 20 6f 74 68 65 72 20 | 66 69 6c 65 73 2e 20 20 |e other |files. |
|00005a90| 46 6f 72 20 65 78 61 6d | 70 6c 65 2c 0a 20 20 20 |For exam|ple,. |
|00005aa0| 20 20 60 31 3a 31 31 61 | 27 20 6d 65 61 6e 73 20 | `1:11a|' means |
|00005ab0| 74 68 61 74 20 74 68 65 | 20 68 75 6e 6b 20 66 6f |that the| hunk fo|
|00005ac0| 6c 6c 6f 77 73 20 6c 69 | 6e 65 20 31 31 20 69 6e |llows li|ne 11 in|
|00005ad0| 20 74 68 65 20 66 69 72 | 73 74 20 66 69 6c 65 20 | the fir|st file |
|00005ae0| 61 6e 64 0a 20 20 20 20 | 20 63 6f 6e 74 61 69 6e |and. | contain|
|00005af0| 73 20 6e 6f 20 6c 69 6e | 65 73 20 66 72 6f 6d 20 |s no lin|es from |
|00005b00| 74 68 61 74 20 66 69 6c | 65 2e 0a 0a 60 46 49 4c |that fil|e...`FIL|
|00005b10| 45 3a 52 63 27 0a 20 20 | 20 20 20 54 68 69 73 20 |E:Rc'. | This |
|00005b20| 68 75 6e 6b 20 63 6f 6e | 74 61 69 6e 73 20 74 68 |hunk con|tains th|
|00005b30| 65 20 6c 69 6e 65 73 20 | 69 6e 20 74 68 65 20 72 |e lines |in the r|
|00005b40| 61 6e 67 65 20 52 20 6f | 66 20 66 69 6c 65 20 46 |ange R o|f file F|
|00005b50| 49 4c 45 2e 20 20 54 68 | 65 0a 20 20 20 20 20 72 |ILE. Th|e. r|
|00005b60| 61 6e 67 65 20 52 20 69 | 73 20 61 20 63 6f 6d 6d |ange R i|s a comm|
|00005b70| 61 2d 73 65 70 61 72 61 | 74 65 64 20 70 61 69 72 |a-separa|ted pair|
|00005b80| 20 6f 66 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 73 | of line| numbers|
|00005b90| 2c 20 6f 72 20 6a 75 73 | 74 20 6f 6e 65 0a 20 20 |, or jus|t one. |
|00005ba0| 20 20 20 6e 75 6d 62 65 | 72 20 69 66 20 74 68 65 | numbe|r if the|
|00005bb0| 20 72 61 6e 67 65 20 69 | 73 20 61 20 73 69 6e 67 | range i|s a sing|
|00005bc0| 6c 65 74 6f 6e 2e 20 20 | 54 6f 20 65 64 69 74 20 |leton. |To edit |
|00005bd0| 74 68 69 73 20 66 69 6c | 65 20 74 6f 20 79 69 65 |this fil|e to yie|
|00005be0| 6c 64 20 74 68 65 0a 20 | 20 20 20 20 6f 74 68 65 |ld the. | othe|
|00005bf0| 72 20 66 69 6c 65 73 2c | 20 6f 6e 65 20 6d 75 73 |r files,| one mus|
|00005c00| 74 20 63 68 61 6e 67 65 | 20 74 68 65 20 73 70 65 |t change| the spe|
|00005c10| 63 69 66 69 65 64 20 6c | 69 6e 65 73 20 74 6f 20 |cified l|ines to |
|00005c20| 62 65 20 74 68 65 20 6c | 69 6e 65 73 0a 20 20 20 |be the l|ines. |
|00005c30| 20 20 74 61 6b 65 6e 20 | 66 72 6f 6d 20 74 68 65 | taken |from the|
|00005c40| 20 6f 74 68 65 72 20 66 | 69 6c 65 73 2e 20 20 46 | other f|iles. F|
|00005c50| 6f 72 20 65 78 61 6d 70 | 6c 65 2c 20 60 32 3a 31 |or examp|le, `2:1|
|00005c60| 31 2c 31 33 63 27 20 6d | 65 61 6e 73 20 74 68 61 |1,13c' m|eans tha|
|00005c70| 74 0a 20 20 20 20 20 74 | 68 65 20 68 75 6e 6b 20 |t. t|he hunk |
|00005c80| 63 6f 6e 74 61 69 6e 73 | 20 6c 69 6e 65 73 20 31 |contains| lines 1|
|00005c90| 31 20 74 68 72 6f 75 67 | 68 20 31 33 20 66 72 6f |1 throug|h 13 fro|
|00005ca0| 6d 20 74 68 65 20 73 65 | 63 6f 6e 64 20 66 69 6c |m the se|cond fil|
|00005cb0| 65 2e 0a 0a 20 20 20 49 | 66 20 74 68 65 20 6c 61 |e... I|f the la|
|00005cc0| 73 74 20 6c 69 6e 65 20 | 69 6e 20 61 20 73 65 74 |st line |in a set|
|00005cd0| 20 6f 66 20 69 6e 70 75 | 74 20 6c 69 6e 65 73 20 | of inpu|t lines |
|00005ce0| 69 73 20 69 6e 63 6f 6d | 70 6c 65 74 65 20 28 2a |is incom|plete (*|
|00005cf0| 6e 6f 74 65 0a 49 6e 63 | 6f 6d 70 6c 65 74 65 20 |note.Inc|omplete |
|00005d00| 4c 69 6e 65 73 3a 3a 2e | 29 2c 20 69 74 20 69 73 |Lines::.|), it is|
|00005d10| 20 64 69 73 74 69 6e 67 | 75 69 73 68 65 64 20 6f | disting|uished o|
|00005d20| 6e 20 6f 75 74 70 75 74 | 20 66 72 6f 6d 20 61 20 |n output| from a |
|00005d30| 66 75 6c 6c 20 6c 69 6e | 65 20 62 79 0a 61 20 66 |full lin|e by.a f|
|00005d40| 6f 6c 6c 6f 77 69 6e 67 | 20 6c 69 6e 65 20 74 68 |ollowing| line th|
|00005d50| 61 74 20 73 74 61 72 74 | 73 20 77 69 74 68 20 60 |at start|s with `|
|00005d60| 5c 27 2e 0a 0a 1f 0a 46 | 69 6c 65 3a 20 64 69 66 |\'.....F|ile: dif|
|00005d70| 66 2e 69 6e 66 6f 2c 20 | 20 4e 6f 64 65 3a 20 64 |f.info, | Node: d|
|00005d80| 69 66 66 33 20 48 75 6e | 6b 73 2c 20 20 4e 65 78 |iff3 Hun|ks, Nex|
|00005d90| 74 3a 20 45 78 61 6d 70 | 6c 65 20 64 69 66 66 33 |t: Examp|le diff3|
|00005da0| 20 4e 6f 72 6d 61 6c 2c | 20 20 50 72 65 76 3a 20 | Normal,| Prev: |
|00005db0| 44 65 74 61 69 6c 65 64 | 20 64 69 66 66 33 20 4e |Detailed| diff3 N|
|00005dc0| 6f 72 6d 61 6c 2c 20 20 | 55 70 3a 20 43 6f 6d 70 |ormal, |Up: Comp|
|00005dd0| 61 72 69 6e 67 20 54 68 | 72 65 65 20 46 69 6c 65 |aring Th|ree File|
|00005de0| 73 0a 0a 60 64 69 66 66 | 33 27 20 48 75 6e 6b 73 |s..`diff|3' Hunks|
|00005df0| 0a 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 0a 0a |.=======|======..|
|00005e00| 20 20 20 47 72 6f 75 70 | 73 20 6f 66 20 6c 69 6e | Group|s of lin|
|00005e10| 65 73 20 74 68 61 74 20 | 64 69 66 66 65 72 20 69 |es that |differ i|
|00005e20| 6e 20 74 77 6f 20 6f 72 | 20 74 68 72 65 65 20 6f |n two or| three o|
|00005e30| 66 20 74 68 65 20 69 6e | 70 75 74 20 66 69 6c 65 |f the in|put file|
|00005e40| 73 20 61 72 65 0a 63 61 | 6c 6c 65 64 20 22 64 69 |s are.ca|lled "di|
|00005e50| 66 66 33 20 68 75 6e 6b | 73 22 2c 20 62 79 20 61 |ff3 hunk|s", by a|
|00005e60| 6e 61 6c 6f 67 79 20 77 | 69 74 68 20 60 64 69 66 |nalogy w|ith `dif|
|00005e70| 66 27 20 68 75 6e 6b 73 | 20 28 2a 6e 6f 74 65 20 |f' hunks| (*note |
|00005e80| 48 75 6e 6b 73 3a 3a 2e | 29 2e 0a 49 66 20 61 6c |Hunks::.|)..If al|
|00005e90| 6c 20 74 68 72 65 65 20 | 69 6e 70 75 74 20 66 69 |l three |input fi|
|00005ea0| 6c 65 73 20 64 69 66 66 | 65 72 20 69 6e 20 61 20 |les diff|er in a |
|00005eb0| 60 64 69 66 66 33 27 20 | 68 75 6e 6b 2c 20 74 68 |`diff3' |hunk, th|
|00005ec0| 65 20 68 75 6e 6b 20 69 | 73 20 63 61 6c 6c 65 64 |e hunk i|s called|
|00005ed0| 20 61 0a 22 74 68 72 65 | 65 2d 77 61 79 20 68 75 | a."thre|e-way hu|
|00005ee0| 6e 6b 22 3b 20 69 66 20 | 6a 75 73 74 20 74 77 6f |nk"; if |just two|
|00005ef0| 20 69 6e 70 75 74 20 66 | 69 6c 65 73 20 64 69 66 | input f|iles dif|
|00005f00| 66 65 72 2c 20 69 74 20 | 69 73 20 61 20 22 74 77 |fer, it |is a "tw|
|00005f10| 6f 2d 77 61 79 0a 68 75 | 6e 6b 22 2e 0a 0a 20 20 |o-way.hu|nk"... |
|00005f20| 20 41 73 20 77 69 74 68 | 20 60 64 69 66 66 27 2c | As with| `diff',|
|00005f30| 20 73 65 76 65 72 61 6c | 20 73 6f 6c 75 74 69 6f | several| solutio|
|00005f40| 6e 73 20 61 72 65 20 70 | 6f 73 73 69 62 6c 65 2e |ns are p|ossible.|
|00005f50| 20 20 57 68 65 6e 20 63 | 6f 6d 70 61 72 69 6e 67 | When c|omparing|
|00005f60| 20 74 68 65 0a 66 69 6c | 65 73 20 60 41 27 2c 20 | the.fil|es `A', |
|00005f70| 60 42 27 2c 20 61 6e 64 | 20 60 43 27 2c 20 60 64 |`B', and| `C', `d|
|00005f80| 69 66 66 33 27 20 6e 6f | 72 6d 61 6c 6c 79 20 66 |iff3' no|rmally f|
|00005f90| 69 6e 64 73 20 60 64 69 | 66 66 33 27 20 68 75 6e |inds `di|ff3' hun|
|00005fa0| 6b 73 20 62 79 0a 6d 65 | 72 67 69 6e 67 20 74 68 |ks by.me|rging th|
|00005fb0| 65 20 74 77 6f 2d 77 61 | 79 20 68 75 6e 6b 73 20 |e two-wa|y hunks |
|00005fc0| 6f 75 74 70 75 74 20 62 | 79 20 74 68 65 20 74 77 |output b|y the tw|
|00005fd0| 6f 20 63 6f 6d 6d 61 6e | 64 73 20 60 64 69 66 66 |o comman|ds `diff|
|00005fe0| 20 41 20 42 27 20 61 6e | 64 0a 60 64 69 66 66 20 | A B' an|d.`diff |
|00005ff0| 41 20 43 27 2e 20 20 54 | 68 69 73 20 64 6f 65 73 |A C'. T|his does|
|00006000| 20 6e 6f 74 20 6e 65 63 | 65 73 73 61 72 69 6c 79 | not nec|essarily|
|00006010| 20 6d 69 6e 69 6d 69 7a | 65 20 74 68 65 20 73 69 | minimiz|e the si|
|00006020| 7a 65 20 6f 66 20 74 68 | 65 20 6f 75 74 70 75 74 |ze of th|e output|
|00006030| 2c 0a 62 75 74 20 65 78 | 63 65 70 74 69 6f 6e 73 |,.but ex|ceptions|
|00006040| 20 73 68 6f 75 6c 64 20 | 62 65 20 72 61 72 65 2e | should |be rare.|
|00006050| 0a 0a 20 20 20 46 6f 72 | 20 65 78 61 6d 70 6c 65 |.. For| example|
|00006060| 2c 20 73 75 70 70 6f 73 | 65 20 60 46 27 20 63 6f |, suppos|e `F' co|
|00006070| 6e 74 61 69 6e 73 20 74 | 68 65 20 74 68 72 65 65 |ntains t|he three|
|00006080| 20 6c 69 6e 65 73 20 60 | 61 27 2c 20 60 62 27 2c | lines `|a', `b',|
|00006090| 20 60 66 27 2c 20 60 47 | 27 0a 63 6f 6e 74 61 69 | `f', `G|'.contai|
|000060a0| 6e 73 20 74 68 65 20 6c | 69 6e 65 73 20 60 67 27 |ns the l|ines `g'|
|000060b0| 2c 20 60 62 27 2c 20 60 | 67 27 2c 20 61 6e 64 20 |, `b', `|g', and |
|000060c0| 60 48 27 20 63 6f 6e 74 | 61 69 6e 73 20 74 68 65 |`H' cont|ains the|
|000060d0| 20 6c 69 6e 65 73 20 60 | 61 27 2c 20 60 62 27 2c | lines `|a', `b',|
|000060e0| 0a 60 68 27 2e 20 20 60 | 64 69 66 66 33 20 46 20 |.`h'. `|diff3 F |
|000060f0| 47 20 48 27 20 6d 69 67 | 68 74 20 6f 75 74 70 75 |G H' mig|ht outpu|
|00006100| 74 20 74 68 65 20 66 6f | 6c 6c 6f 77 69 6e 67 3a |t the fo|llowing:|
|00006110| 0a 0a 20 20 20 20 20 3d | 3d 3d 3d 32 0a 20 20 20 |.. =|===2. |
|00006120| 20 20 31 3a 31 63 0a 20 | 20 20 20 20 33 3a 31 63 | 1:1c. | 3:1c|
|00006130| 0a 20 20 20 20 20 20 20 | 61 0a 20 20 20 20 20 32 |. |a. 2|
|00006140| 3a 31 63 0a 20 20 20 20 | 20 20 20 67 0a 20 20 20 |:1c. | g. |
|00006150| 20 20 3d 3d 3d 3d 0a 20 | 20 20 20 20 31 3a 33 63 | ====. | 1:3c|
|00006160| 0a 20 20 20 20 20 20 20 | 66 0a 20 20 20 20 20 32 |. |f. 2|
|00006170| 3a 33 63 0a 20 20 20 20 | 20 20 20 67 0a 20 20 20 |:3c. | g. |
|00006180| 20 20 33 3a 33 63 0a 20 | 20 20 20 20 20 20 68 0a | 3:3c. | h.|
|00006190| 0a 62 65 63 61 75 73 65 | 20 69 74 20 66 6f 75 6e |.because| it foun|
|000061a0| 64 20 61 20 74 77 6f 2d | 77 61 79 20 68 75 6e 6b |d a two-|way hunk|
|000061b0| 20 63 6f 6e 74 61 69 6e | 69 6e 67 20 60 61 27 20 | contain|ing `a' |
|000061c0| 69 6e 20 74 68 65 20 66 | 69 72 73 74 20 61 6e 64 |in the f|irst and|
|000061d0| 20 74 68 69 72 64 0a 66 | 69 6c 65 73 20 61 6e 64 | third.f|iles and|
|000061e0| 20 60 67 27 20 69 6e 20 | 74 68 65 20 73 65 63 6f | `g' in |the seco|
|000061f0| 6e 64 20 66 69 6c 65 2c | 20 74 68 65 6e 20 74 68 |nd file,| then th|
|00006200| 65 20 73 69 6e 67 6c 65 | 20 6c 69 6e 65 20 60 62 |e single| line `b|
|00006210| 27 20 63 6f 6d 6d 6f 6e | 20 74 6f 0a 61 6c 6c 20 |' common| to.all |
|00006220| 74 68 72 65 65 20 66 69 | 6c 65 73 2c 20 74 68 65 |three fi|les, the|
|00006230| 6e 20 61 20 74 68 72 65 | 65 2d 77 61 79 20 68 75 |n a thre|e-way hu|
|00006240| 6e 6b 20 63 6f 6e 74 61 | 69 6e 69 6e 67 20 74 68 |nk conta|ining th|
|00006250| 65 20 6c 61 73 74 20 6c | 69 6e 65 20 6f 66 20 65 |e last l|ine of e|
|00006260| 61 63 68 0a 66 69 6c 65 | 2e 0a 0a 1f 0a 46 69 6c |ach.file|.....Fil|
|00006270| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|00006280| 6f 64 65 3a 20 45 78 61 | 6d 70 6c 65 20 64 69 66 |ode: Exa|mple dif|
|00006290| 66 33 20 4e 6f 72 6d 61 | 6c 2c 20 20 50 72 65 76 |f3 Norma|l, Prev|
|000062a0| 3a 20 64 69 66 66 33 20 | 48 75 6e 6b 73 2c 20 20 |: diff3 |Hunks, |
|000062b0| 55 70 3a 20 43 6f 6d 70 | 61 72 69 6e 67 20 54 68 |Up: Comp|aring Th|
|000062c0| 72 65 65 20 46 69 6c 65 | 73 0a 0a 41 6e 20 45 78 |ree File|s..An Ex|
|000062d0| 61 6d 70 6c 65 20 6f 66 | 20 60 64 69 66 66 33 27 |ample of| `diff3'|
|000062e0| 20 4e 6f 72 6d 61 6c 20 | 46 6f 72 6d 61 74 0a 3d | Normal |Format.=|
|000062f0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006300| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006310| 3d 3d 0a 0a 20 20 20 48 | 65 72 65 20 69 73 20 74 |==.. H|ere is t|
|00006320| 68 65 20 6f 75 74 70 75 | 74 20 6f 66 20 74 68 65 |he outpu|t of the|
|00006330| 20 63 6f 6d 6d 61 6e 64 | 20 60 64 69 66 66 33 20 | command| `diff3 |
|00006340| 6c 61 6f 20 74 7a 75 20 | 74 61 6f 27 20 28 2a 6e |lao tzu |tao' (*n|
|00006350| 6f 74 65 20 53 61 6d 70 | 6c 65 0a 64 69 66 66 33 |ote Samp|le.diff3|
|00006360| 20 49 6e 70 75 74 3a 3a | 2e 2c 20 66 6f 72 20 74 | Input::|., for t|
|00006370| 68 65 20 63 6f 6d 70 6c | 65 74 65 20 63 6f 6e 74 |he compl|ete cont|
|00006380| 65 6e 74 73 20 6f 66 20 | 74 68 65 20 66 69 6c 65 |ents of |the file|
|00006390| 73 29 2e 20 20 4e 6f 74 | 69 63 65 20 74 68 61 74 |s). Not|ice that|
|000063a0| 0a 69 74 20 73 68 6f 77 | 73 20 6f 6e 6c 79 20 74 |.it show|s only t|
|000063b0| 68 65 20 6c 69 6e 65 73 | 20 74 68 61 74 20 61 72 |he lines| that ar|
|000063c0| 65 20 64 69 66 66 65 72 | 65 6e 74 20 61 6d 6f 6e |e differ|ent amon|
|000063d0| 67 20 74 68 65 20 74 68 | 72 65 65 20 66 69 6c 65 |g the th|ree file|
|000063e0| 73 2e 0a 0a 20 20 20 20 | 20 3d 3d 3d 3d 32 0a 20 |s... | ====2. |
|000063f0| 20 20 20 20 31 3a 31 2c | 32 63 0a 20 20 20 20 20 | 1:1,|2c. |
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
