home *** CD-ROM | disk | FTP | other *** search
view JSON data
|
view as text
|
open on a Mac
|
open on a PC
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. |
|00006400| 33 3a 31 2c 32 63 0a 20 | 20 20 20 20 20 20 54 68 |3:1,2c. | Th|
|00006410| 65 20 57 61 79 20 74 68 | 61 74 20 63 61 6e 20 62 |e Way th|at can b|
|00006420| 65 20 74 6f 6c 64 20 6f | 66 20 69 73 20 6e 6f 74 |e told o|f is not|
|00006430| 20 74 68 65 20 65 74 65 | 72 6e 61 6c 20 57 61 79 | the ete|rnal Way|
|00006440| 3b 0a 20 20 20 20 20 20 | 20 54 68 65 20 6e 61 6d |;. | The nam|
|00006450| 65 20 74 68 61 74 20 63 | 61 6e 20 62 65 20 6e 61 |e that c|an be na|
|00006460| 6d 65 64 20 69 73 20 6e | 6f 74 20 74 68 65 20 65 |med is n|ot the e|
|00006470| 74 65 72 6e 61 6c 20 6e | 61 6d 65 2e 0a 20 20 20 |ternal n|ame.. |
|00006480| 20 20 32 3a 30 61 0a 20 | 20 20 20 20 3d 3d 3d 3d | 2:0a. | ====|
|00006490| 31 0a 20 20 20 20 20 31 | 3a 34 63 0a 20 20 20 20 |1. 1|:4c. |
|000064a0| 20 20 20 54 68 65 20 4e | 61 6d 65 64 20 69 73 20 | The N|amed is |
|000064b0| 74 68 65 20 6d 6f 74 68 | 65 72 20 6f 66 20 61 6c |the moth|er of al|
|000064c0| 6c 20 74 68 69 6e 67 73 | 2e 0a 20 20 20 20 20 32 |l things|.. 2|
|000064d0| 3a 32 2c 33 63 0a 20 20 | 20 20 20 33 3a 34 2c 35 |:2,3c. | 3:4,5|
|000064e0| 63 0a 20 20 20 20 20 20 | 20 54 68 65 20 6e 61 6d |c. | The nam|
|000064f0| 65 64 20 69 73 20 74 68 | 65 20 6d 6f 74 68 65 72 |ed is th|e mother|
|00006500| 20 6f 66 20 61 6c 6c 20 | 74 68 69 6e 67 73 2e 0a | of all |things..|
|00006510| 20 20 20 20 20 0a 20 20 | 20 20 20 3d 3d 3d 3d 33 | . | ====3|
|00006520| 0a 20 20 20 20 20 31 3a | 38 63 0a 20 20 20 20 20 |. 1:|8c. |
|00006530| 32 3a 37 63 0a 20 20 20 | 20 20 20 20 20 20 73 6f |2:7c. | so|
|00006540| 20 77 65 20 6d 61 79 20 | 73 65 65 20 74 68 65 69 | we may |see thei|
|00006550| 72 20 6f 75 74 63 6f 6d | 65 2e 0a 20 20 20 20 20 |r outcom|e.. |
|00006560| 33 3a 39 63 0a 20 20 20 | 20 20 20 20 20 20 73 6f |3:9c. | so|
|00006570| 20 77 65 20 6d 61 79 20 | 73 65 65 20 74 68 65 69 | we may |see thei|
|00006580| 72 20 72 65 73 75 6c 74 | 2e 0a 20 20 20 20 20 3d |r result|.. =|
|00006590| 3d 3d 3d 0a 20 20 20 20 | 20 31 3a 31 31 61 0a 20 |===. | 1:11a. |
|000065a0| 20 20 20 20 32 3a 31 31 | 2c 31 33 63 0a 20 20 20 | 2:11|,13c. |
|000065b0| 20 20 20 20 54 68 65 79 | 20 62 6f 74 68 20 6d 61 | They| both ma|
|000065c0| 79 20 62 65 20 63 61 6c | 6c 65 64 20 64 65 65 70 |y be cal|led deep|
|000065d0| 20 61 6e 64 20 70 72 6f | 66 6f 75 6e 64 2e 0a 20 | and pro|found.. |
|000065e0| 20 20 20 20 20 20 44 65 | 65 70 65 72 20 61 6e 64 | De|eper and|
|000065f0| 20 6d 6f 72 65 20 70 72 | 6f 66 6f 75 6e 64 2c 0a | more pr|ofound,.|
|00006600| 20 20 20 20 20 20 20 54 | 68 65 20 64 6f 6f 72 20 | T|he door |
|00006610| 6f 66 20 61 6c 6c 20 73 | 75 62 74 6c 65 74 69 65 |of all s|ubtletie|
|00006620| 73 21 0a 20 20 20 20 20 | 33 3a 31 33 2c 31 34 63 |s!. |3:13,14c|
|00006630| 0a 20 20 20 20 20 0a 20 | 20 20 20 20 20 20 20 20 |. . | |
|00006640| 2d 2d 20 54 68 65 20 57 | 61 79 20 6f 66 20 4c 61 |-- The W|ay of La|
|00006650| 6f 2d 54 7a 75 2c 20 74 | 72 2e 20 57 69 6e 67 2d |o-Tzu, t|r. Wing-|
|00006660| 74 73 69 74 20 43 68 61 | 6e 0a 0a 1f 0a 46 69 6c |tsit Cha|n....Fil|
|00006670| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|00006680| 6f 64 65 3a 20 64 69 66 | 66 33 20 4d 65 72 67 69 |ode: dif|f3 Mergi|
|00006690| 6e 67 2c 20 20 4e 65 78 | 74 3a 20 49 6e 74 65 72 |ng, Nex|t: Inter|
|000066a0| 61 63 74 69 76 65 20 4d | 65 72 67 69 6e 67 2c 20 |active M|erging, |
|000066b0| 20 50 72 65 76 3a 20 43 | 6f 6d 70 61 72 69 6e 67 | Prev: C|omparing|
|000066c0| 20 54 68 72 65 65 20 46 | 69 6c 65 73 2c 20 20 55 | Three F|iles, U|
|000066d0| 70 3a 20 54 6f 70 0a 0a | 4d 65 72 67 69 6e 67 20 |p: Top..|Merging |
|000066e0| 46 72 6f 6d 20 61 20 43 | 6f 6d 6d 6f 6e 20 41 6e |From a C|ommon An|
|000066f0| 63 65 73 74 6f 72 0a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |cestor.*|********|
|00006700| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00006710| 2a 2a 2a 2a 2a 0a 0a 20 | 20 20 57 68 65 6e 20 74 |*****.. | When t|
|00006720| 77 6f 20 70 65 6f 70 6c | 65 20 68 61 76 65 20 6d |wo peopl|e have m|
|00006730| 61 64 65 20 63 68 61 6e | 67 65 73 20 74 6f 20 63 |ade chan|ges to c|
|00006740| 6f 70 69 65 73 20 6f 66 | 20 74 68 65 20 73 61 6d |opies of| the sam|
|00006750| 65 20 66 69 6c 65 2c 0a | 60 64 69 66 66 33 27 20 |e file,.|`diff3' |
|00006760| 63 61 6e 20 70 72 6f 64 | 75 63 65 20 61 20 6d 65 |can prod|uce a me|
|00006770| 72 67 65 64 20 6f 75 74 | 70 75 74 20 74 68 61 74 |rged out|put that|
|00006780| 20 63 6f 6e 74 61 69 6e | 73 20 62 6f 74 68 20 73 | contain|s both s|
|00006790| 65 74 73 20 6f 66 20 63 | 68 61 6e 67 65 73 0a 74 |ets of c|hanges.t|
|000067a0| 6f 67 65 74 68 65 72 20 | 77 69 74 68 20 77 61 72 |ogether |with war|
|000067b0| 6e 69 6e 67 73 20 61 62 | 6f 75 74 20 63 6f 6e 66 |nings ab|out conf|
|000067c0| 6c 69 63 74 73 2e 0a 0a | 20 20 20 4f 6e 65 20 6d |licts...| One m|
|000067d0| 69 67 68 74 20 69 6d 61 | 67 69 6e 65 20 70 72 6f |ight ima|gine pro|
|000067e0| 67 72 61 6d 73 20 77 69 | 74 68 20 6e 61 6d 65 73 |grams wi|th names|
|000067f0| 20 6c 69 6b 65 20 60 64 | 69 66 66 34 27 20 61 6e | like `d|iff4' an|
|00006800| 64 20 60 64 69 66 66 35 | 27 20 74 6f 0a 63 6f 6d |d `diff5|' to.com|
|00006810| 70 61 72 65 20 6d 6f 72 | 65 20 74 68 61 6e 20 74 |pare mor|e than t|
|00006820| 68 72 65 65 20 66 69 6c | 65 73 20 73 69 6d 75 6c |hree fil|es simul|
|00006830| 74 61 6e 65 6f 75 73 6c | 79 2c 20 62 75 74 20 69 |taneousl|y, but i|
|00006840| 6e 20 70 72 61 63 74 69 | 63 65 20 74 68 65 20 6e |n practi|ce the n|
|00006850| 65 65 64 0a 72 61 72 65 | 6c 79 20 61 72 69 73 65 |eed.rare|ly arise|
|00006860| 73 2e 20 20 59 6f 75 20 | 63 61 6e 20 75 73 65 20 |s. You |can use |
|00006870| 60 64 69 66 66 33 27 20 | 74 6f 20 6d 65 72 67 65 |`diff3' |to merge|
|00006880| 20 74 68 72 65 65 20 6f | 72 20 6d 6f 72 65 20 73 | three o|r more s|
|00006890| 65 74 73 20 6f 66 0a 63 | 68 61 6e 67 65 73 20 74 |ets of.c|hanges t|
|000068a0| 6f 20 61 20 66 69 6c 65 | 20 62 79 20 6d 65 72 67 |o a file| by merg|
|000068b0| 69 6e 67 20 74 77 6f 20 | 63 68 61 6e 67 65 20 73 |ing two |change s|
|000068c0| 65 74 73 20 61 74 20 61 | 20 74 69 6d 65 2e 0a 0a |ets at a| time...|
|000068d0| 20 20 20 60 64 69 66 66 | 33 27 20 63 61 6e 20 69 | `diff|3' can i|
|000068e0| 6e 63 6f 72 70 6f 72 61 | 74 65 20 63 68 61 6e 67 |ncorpora|te chang|
|000068f0| 65 73 20 66 72 6f 6d 20 | 74 77 6f 20 6d 6f 64 69 |es from |two modi|
|00006900| 66 69 65 64 20 76 65 72 | 73 69 6f 6e 73 20 69 6e |fied ver|sions in|
|00006910| 74 6f 20 61 0a 63 6f 6d | 6d 6f 6e 20 70 72 65 63 |to a.com|mon prec|
|00006920| 65 64 69 6e 67 20 76 65 | 72 73 69 6f 6e 2e 20 20 |eding ve|rsion. |
|00006930| 54 68 69 73 20 6c 65 74 | 73 20 79 6f 75 20 6d 65 |This let|s you me|
|00006940| 72 67 65 20 74 68 65 20 | 73 65 74 73 20 6f 66 20 |rge the |sets of |
|00006950| 63 68 61 6e 67 65 73 0a | 72 65 70 72 65 73 65 6e |changes.|represen|
|00006960| 74 65 64 20 62 79 20 74 | 68 65 20 74 77 6f 20 6e |ted by t|he two n|
|00006970| 65 77 65 72 20 66 69 6c | 65 73 2e 20 20 53 70 65 |ewer fil|es. Spe|
|00006980| 63 69 66 79 20 74 68 65 | 20 63 6f 6d 6d 6f 6e 20 |cify the| common |
|00006990| 61 6e 63 65 73 74 6f 72 | 20 76 65 72 73 69 6f 6e |ancestor| version|
|000069a0| 0a 61 73 20 74 68 65 20 | 73 65 63 6f 6e 64 20 61 |.as the |second a|
|000069b0| 72 67 75 6d 65 6e 74 20 | 61 6e 64 20 74 68 65 20 |rgument |and the |
|000069c0| 74 77 6f 20 6e 65 77 65 | 72 20 76 65 72 73 69 6f |two newe|r versio|
|000069d0| 6e 73 20 61 73 20 74 68 | 65 20 66 69 72 73 74 20 |ns as th|e first |
|000069e0| 61 6e 64 20 74 68 69 72 | 64 0a 61 72 67 75 6d 65 |and thir|d.argume|
|000069f0| 6e 74 73 2c 20 6c 69 6b | 65 20 74 68 69 73 3a 0a |nts, lik|e this:.|
|00006a00| 0a 20 20 20 20 20 64 69 | 66 66 33 20 4d 49 4e 45 |. di|ff3 MINE|
|00006a10| 20 4f 4c 44 45 52 20 59 | 4f 55 52 53 0a 0a 59 6f | OLDER Y|OURS..Yo|
|00006a20| 75 20 63 61 6e 20 72 65 | 6d 65 6d 62 65 72 20 74 |u can re|member t|
|00006a30| 68 65 20 6f 72 64 65 72 | 20 6f 66 20 74 68 65 20 |he order| of the |
|00006a40| 61 72 67 75 6d 65 6e 74 | 73 20 62 79 20 6e 6f 74 |argument|s by not|
|00006a50| 69 6e 67 20 74 68 61 74 | 20 74 68 65 79 20 61 72 |ing that| they ar|
|00006a60| 65 20 69 6e 0a 61 6c 70 | 68 61 62 65 74 69 63 61 |e in.alp|habetica|
|00006a70| 6c 20 6f 72 64 65 72 2e | 0a 0a 20 20 20 59 6f 75 |l order.|.. You|
|00006a80| 20 63 61 6e 20 74 68 69 | 6e 6b 20 6f 66 20 74 68 | can thi|nk of th|
|00006a90| 69 73 20 61 73 20 73 75 | 62 74 72 61 63 74 69 6e |is as su|btractin|
|00006aa0| 67 20 4f 4c 44 45 52 20 | 66 72 6f 6d 20 59 4f 55 |g OLDER |from YOU|
|00006ab0| 52 53 20 61 6e 64 20 61 | 64 64 69 6e 67 20 74 68 |RS and a|dding th|
|00006ac0| 65 0a 72 65 73 75 6c 74 | 20 74 6f 20 4d 49 4e 45 |e.result| to MINE|
|00006ad0| 2c 20 6f 72 20 61 73 20 | 6d 65 72 67 69 6e 67 20 |, or as |merging |
|00006ae0| 69 6e 74 6f 20 4d 49 4e | 45 20 74 68 65 20 63 68 |into MIN|E the ch|
|00006af0| 61 6e 67 65 73 20 74 68 | 61 74 20 77 6f 75 6c 64 |anges th|at would|
|00006b00| 20 74 75 72 6e 0a 4f 4c | 44 45 52 20 69 6e 74 6f | turn.OL|DER into|
|00006b10| 20 59 4f 55 52 53 2e 20 | 20 54 68 69 73 20 6d 65 | YOURS. | This me|
|00006b20| 72 67 69 6e 67 20 69 73 | 20 77 65 6c 6c 2d 64 65 |rging is| well-de|
|00006b30| 66 69 6e 65 64 20 61 73 | 20 6c 6f 6e 67 20 61 73 |fined as| long as|
|00006b40| 20 4d 49 4e 45 20 61 6e | 64 0a 4f 4c 44 45 52 20 | MINE an|d.OLDER |
|00006b50| 6d 61 74 63 68 20 69 6e | 20 74 68 65 20 6e 65 69 |match in| the nei|
|00006b60| 67 68 62 6f 72 68 6f 6f | 64 20 6f 66 20 65 61 63 |ghborhoo|d of eac|
|00006b70| 68 20 73 75 63 68 20 63 | 68 61 6e 67 65 2e 20 20 |h such c|hange. |
|00006b80| 54 68 69 73 20 66 61 69 | 6c 73 20 74 6f 20 62 65 |This fai|ls to be|
|00006b90| 0a 74 72 75 65 20 77 68 | 65 6e 20 61 6c 6c 20 74 |.true wh|en all t|
|00006ba0| 68 72 65 65 20 69 6e 70 | 75 74 20 66 69 6c 65 73 |hree inp|ut files|
|00006bb0| 20 64 69 66 66 65 72 20 | 6f 72 20 77 68 65 6e 20 | differ |or when |
|00006bc0| 6f 6e 6c 79 20 4f 4c 44 | 45 52 20 64 69 66 66 65 |only OLD|ER diffe|
|00006bd0| 72 73 3b 20 77 65 0a 63 | 61 6c 6c 20 74 68 69 73 |rs; we.c|all this|
|00006be0| 20 61 20 22 63 6f 6e 66 | 6c 69 63 74 22 2e 20 20 | a "conf|lict". |
|00006bf0| 57 68 65 6e 20 61 6c 6c | 20 74 68 72 65 65 20 69 |When all| three i|
|00006c00| 6e 70 75 74 20 66 69 6c | 65 73 20 64 69 66 66 65 |nput fil|es diffe|
|00006c10| 72 2c 20 77 65 20 63 61 | 6c 6c 20 74 68 65 0a 63 |r, we ca|ll the.c|
|00006c20| 6f 6e 66 6c 69 63 74 20 | 61 6e 20 22 6f 76 65 72 |onflict |an "over|
|00006c30| 6c 61 70 22 2e 0a 0a 20 | 20 20 60 64 69 66 66 33 |lap"... | `diff3|
|00006c40| 27 20 67 69 76 65 73 20 | 79 6f 75 20 73 65 76 65 |' gives |you seve|
|00006c50| 72 61 6c 20 77 61 79 73 | 20 74 6f 20 68 61 6e 64 |ral ways| to hand|
|00006c60| 6c 65 20 6f 76 65 72 6c | 61 70 73 20 61 6e 64 20 |le overl|aps and |
|00006c70| 63 6f 6e 66 6c 69 63 74 | 73 2e 0a 59 6f 75 20 63 |conflict|s..You c|
|00006c80| 61 6e 20 6f 6d 69 74 20 | 6f 76 65 72 6c 61 70 73 |an omit |overlaps|
|00006c90| 20 6f 72 20 63 6f 6e 66 | 6c 69 63 74 73 2c 20 6f | or conf|licts, o|
|00006ca0| 72 20 73 65 6c 65 63 74 | 20 6f 6e 6c 79 20 6f 76 |r select| only ov|
|00006cb0| 65 72 6c 61 70 73 2c 20 | 6f 72 20 6d 61 72 6b 0a |erlaps, |or mark.|
|00006cc0| 63 6f 6e 66 6c 69 63 74 | 73 20 77 69 74 68 20 73 |conflict|s with s|
|00006cd0| 70 65 63 69 61 6c 20 60 | 3c 3c 3c 3c 3c 3c 3c 27 |pecial `|<<<<<<<'|
|00006ce0| 20 61 6e 64 20 60 3e 3e | 3e 3e 3e 3e 3e 27 20 6c | and `>>|>>>>>' l|
|00006cf0| 69 6e 65 73 2e 0a 0a 20 | 20 20 60 64 69 66 66 33 |ines... | `diff3|
|00006d00| 27 20 63 61 6e 20 6f 75 | 74 70 75 74 20 74 68 65 |' can ou|tput the|
|00006d10| 20 6d 65 72 67 65 20 72 | 65 73 75 6c 74 73 20 61 | merge r|esults a|
|00006d20| 73 20 61 6e 20 60 65 64 | 27 20 73 63 72 69 70 74 |s an `ed|' script|
|00006d30| 20 74 68 61 74 20 74 68 | 61 74 20 63 61 6e 0a 62 | that th|at can.b|
|00006d40| 65 20 61 70 70 6c 69 65 | 64 20 74 6f 20 74 68 65 |e applie|d to the|
|00006d50| 20 66 69 72 73 74 20 66 | 69 6c 65 20 74 6f 20 79 | first f|ile to y|
|00006d60| 69 65 6c 64 20 74 68 65 | 20 6d 65 72 67 65 64 20 |ield the| merged |
|00006d70| 6f 75 74 70 75 74 2e 20 | 20 48 6f 77 65 76 65 72 |output. | However|
|00006d80| 2c 20 69 74 0a 69 73 20 | 75 73 75 61 6c 6c 79 20 |, it.is |usually |
|00006d90| 62 65 74 74 65 72 20 74 | 6f 20 68 61 76 65 20 60 |better t|o have `|
|00006da0| 64 69 66 66 33 27 20 67 | 65 6e 65 72 61 74 65 20 |diff3' g|enerate |
|00006db0| 74 68 65 20 6d 65 72 67 | 65 64 20 6f 75 74 70 75 |the merg|ed outpu|
|00006dc0| 74 20 64 69 72 65 63 74 | 6c 79 3b 0a 74 68 69 73 |t direct|ly;.this|
|00006dd0| 20 62 79 70 61 73 73 65 | 73 20 73 6f 6d 65 20 70 | bypasse|s some p|
|00006de0| 72 6f 62 6c 65 6d 73 20 | 77 69 74 68 20 60 65 64 |roblems |with `ed|
|00006df0| 27 2e 0a 0a 2a 20 4d 65 | 6e 75 3a 0a 0a 2a 20 57 |'...* Me|nu:..* W|
|00006e00| 68 69 63 68 20 43 68 61 | 6e 67 65 73 3a 3a 09 09 |hich Cha|nges::..|
|00006e10| 53 65 6c 65 63 74 69 6e | 67 20 63 68 61 6e 67 65 |Selectin|g change|
|00006e20| 73 20 74 6f 20 69 6e 63 | 6f 72 70 6f 72 61 74 65 |s to inc|orporate|
|00006e30| 2e 0a 2a 20 4d 61 72 6b | 69 6e 67 20 43 6f 6e 66 |..* Mark|ing Conf|
|00006e40| 6c 69 63 74 73 3a 3a 09 | 09 4d 61 72 6b 69 6e 67 |licts::.|.Marking|
|00006e50| 20 63 6f 6e 66 6c 69 63 | 74 73 2e 0a 2a 20 42 79 | conflic|ts..* By|
|00006e60| 70 61 73 73 69 6e 67 20 | 65 64 3a 3a 09 09 47 65 |passing |ed::..Ge|
|00006e70| 6e 65 72 61 74 69 6e 67 | 20 6d 65 72 67 65 64 20 |nerating| merged |
|00006e80| 6f 75 74 70 75 74 20 64 | 69 72 65 63 74 6c 79 2e |output d|irectly.|
|00006e90| 0a 2a 20 4d 65 72 67 69 | 6e 67 20 49 6e 63 6f 6d |.* Mergi|ng Incom|
|00006ea0| 70 6c 65 74 65 20 4c 69 | 6e 65 73 3a 3a 09 48 6f |plete Li|nes::.Ho|
|00006eb0| 77 20 60 64 69 66 66 33 | 27 20 6d 65 72 67 65 73 |w `diff3|' merges|
|00006ec0| 20 69 6e 63 6f 6d 70 6c | 65 74 65 20 6c 69 6e 65 | incompl|ete line|
|00006ed0| 73 2e 0a 2a 20 53 61 76 | 69 6e 67 20 74 68 65 20 |s..* Sav|ing the |
|00006ee0| 43 68 61 6e 67 65 64 20 | 46 69 6c 65 3a 3a 09 45 |Changed |File::.E|
|00006ef0| 6d 75 6c 61 74 69 6e 67 | 20 53 79 73 74 65 6d 20 |mulating| System |
|00006f00| 56 20 62 65 68 61 76 69 | 6f 72 2e 0a 0a 1f 0a 46 |V behavi|or.....F|
|00006f10| 69 6c 65 3a 20 64 69 66 | 66 2e 69 6e 66 6f 2c 20 |ile: dif|f.info, |
|00006f20| 20 4e 6f 64 65 3a 20 57 | 68 69 63 68 20 43 68 61 | Node: W|hich Cha|
|00006f30| 6e 67 65 73 2c 20 20 4e | 65 78 74 3a 20 4d 61 72 |nges, N|ext: Mar|
|00006f40| 6b 69 6e 67 20 43 6f 6e | 66 6c 69 63 74 73 2c 20 |king Con|flicts, |
|00006f50| 20 55 70 3a 20 64 69 66 | 66 33 20 4d 65 72 67 69 | Up: dif|f3 Mergi|
|00006f60| 6e 67 0a 0a 53 65 6c 65 | 63 74 69 6e 67 20 57 68 |ng..Sele|cting Wh|
|00006f70| 69 63 68 20 43 68 61 6e | 67 65 73 20 74 6f 20 49 |ich Chan|ges to I|
|00006f80| 6e 63 6f 72 70 6f 72 61 | 74 65 0a 3d 3d 3d 3d 3d |ncorpora|te.=====|
|00006f90| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006fa0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00006fb0| 3d 0a 0a 20 20 20 59 6f | 75 20 63 61 6e 20 73 65 |=.. Yo|u can se|
|00006fc0| 6c 65 63 74 20 61 6c 6c | 20 75 6e 6d 65 72 67 65 |lect all| unmerge|
|00006fd0| 64 20 63 68 61 6e 67 65 | 73 20 66 72 6f 6d 20 4f |d change|s from O|
|00006fe0| 4c 44 45 52 20 74 6f 20 | 59 4f 55 52 53 20 66 6f |LDER to |YOURS fo|
|00006ff0| 72 20 6d 65 72 67 69 6e | 67 0a 69 6e 74 6f 20 4d |r mergin|g.into M|
|00007000| 49 4e 45 20 77 69 74 68 | 20 74 68 65 20 60 2d 65 |INE with| the `-e|
|00007010| 27 20 6f 72 20 60 2d 2d | 65 64 27 20 6f 70 74 69 |' or `--|ed' opti|
|00007020| 6f 6e 2e 20 20 59 6f 75 | 20 63 61 6e 20 73 65 6c |on. You| can sel|
|00007030| 65 63 74 20 6f 6e 6c 79 | 20 74 68 65 0a 6e 6f 6e |ect only| the.non|
|00007040| 6f 76 65 72 6c 61 70 70 | 69 6e 67 20 75 6e 6d 65 |overlapp|ing unme|
|00007050| 72 67 65 64 20 63 68 61 | 6e 67 65 73 20 77 69 74 |rged cha|nges wit|
|00007060| 68 20 60 2d 33 27 20 6f | 72 20 60 2d 2d 65 61 73 |h `-3' o|r `--eas|
|00007070| 79 2d 6f 6e 6c 79 27 2c | 20 61 6e 64 20 79 6f 75 |y-only',| and you|
|00007080| 20 63 61 6e 0a 73 65 6c | 65 63 74 20 6f 6e 6c 79 | can.sel|ect only|
|00007090| 20 74 68 65 20 6f 76 65 | 72 6c 61 70 70 69 6e 67 | the ove|rlapping|
|000070a0| 20 63 68 61 6e 67 65 73 | 20 77 69 74 68 20 60 2d | changes| with `-|
|000070b0| 78 27 20 6f 72 20 60 2d | 2d 6f 76 65 72 6c 61 70 |x' or `-|-overlap|
|000070c0| 2d 6f 6e 6c 79 27 2e 0a | 0a 20 20 20 54 68 65 20 |-only'..|. The |
|000070d0| 60 2d 65 27 2c 20 60 2d | 33 27 20 61 6e 64 20 60 |`-e', `-|3' and `|
|000070e0| 2d 78 27 20 6f 70 74 69 | 6f 6e 73 20 73 65 6c 65 |-x' opti|ons sele|
|000070f0| 63 74 20 6f 6e 6c 79 20 | 22 75 6e 6d 65 72 67 65 |ct only |"unmerge|
|00007100| 64 20 63 68 61 6e 67 65 | 73 22 2c 20 69 2e 65 2e |d change|s", i.e.|
|00007110| 0a 63 68 61 6e 67 65 73 | 20 77 68 65 72 65 20 4d |.changes| where M|
|00007120| 49 4e 45 20 61 6e 64 20 | 59 4f 55 52 53 20 64 69 |INE and |YOURS di|
|00007130| 66 66 65 72 3b 20 74 68 | 65 79 20 69 67 6e 6f 72 |ffer; th|ey ignor|
|00007140| 65 20 63 68 61 6e 67 65 | 73 20 66 72 6f 6d 20 4f |e change|s from O|
|00007150| 4c 44 45 52 20 74 6f 0a | 59 4f 55 52 53 20 77 68 |LDER to.|YOURS wh|
|00007160| 65 72 65 20 4d 49 4e 45 | 20 61 6e 64 20 59 4f 55 |ere MINE| and YOU|
|00007170| 52 53 20 61 72 65 20 69 | 64 65 6e 74 69 63 61 6c |RS are i|dentical|
|00007180| 2c 20 62 65 63 61 75 73 | 65 20 74 68 65 79 20 61 |, becaus|e they a|
|00007190| 73 73 75 6d 65 20 74 68 | 61 74 20 73 75 63 68 0a |ssume th|at such.|
|000071a0| 63 68 61 6e 67 65 73 20 | 68 61 76 65 20 61 6c 72 |changes |have alr|
|000071b0| 65 61 64 79 20 62 65 65 | 6e 20 6d 65 72 67 65 64 |eady bee|n merged|
|000071c0| 2e 20 20 49 66 20 74 68 | 69 73 20 61 73 73 75 6d |. If th|is assum|
|000071d0| 70 74 69 6f 6e 20 69 73 | 20 6e 6f 74 20 61 20 73 |ption is| not a s|
|000071e0| 61 66 65 0a 6f 6e 65 2c | 20 79 6f 75 20 63 61 6e |afe.one,| you can|
|000071f0| 20 75 73 65 20 74 68 65 | 20 60 2d 41 27 20 6f 72 | use the| `-A' or|
|00007200| 20 60 2d 2d 73 68 6f 77 | 2d 61 6c 6c 27 20 6f 70 | `--show|-all' op|
|00007210| 74 69 6f 6e 20 28 2a 6e | 6f 74 65 20 4d 61 72 6b |tion (*n|ote Mark|
|00007220| 69 6e 67 0a 43 6f 6e 66 | 6c 69 63 74 73 3a 3a 2e |ing.Conf|licts::.|
|00007230| 29 2e 0a 0a 20 20 20 48 | 65 72 65 20 69 73 20 74 |)... H|ere is t|
|00007240| 68 65 20 6f 75 74 70 75 | 74 20 6f 66 20 74 68 65 |he outpu|t of the|
|00007250| 20 63 6f 6d 6d 61 6e 64 | 20 60 64 69 66 66 33 27 | command| `diff3'|
|00007260| 20 77 69 74 68 20 65 61 | 63 68 20 6f 66 20 74 68 | with ea|ch of th|
|00007270| 65 73 65 20 74 68 72 65 | 65 0a 6f 70 74 69 6f 6e |ese thre|e.option|
|00007280| 73 20 28 2a 6e 6f 74 65 | 20 53 61 6d 70 6c 65 20 |s (*note| Sample |
|00007290| 64 69 66 66 33 20 49 6e | 70 75 74 3a 3a 2e 2c 20 |diff3 In|put::., |
|000072a0| 66 6f 72 20 74 68 65 20 | 63 6f 6d 70 6c 65 74 65 |for the |complete|
|000072b0| 20 63 6f 6e 74 65 6e 74 | 73 20 6f 66 20 74 68 65 | content|s of the|
|000072c0| 0a 66 69 6c 65 73 29 2e | 20 20 4e 6f 74 69 63 65 |.files).| Notice|
|000072d0| 20 74 68 61 74 20 60 2d | 65 27 20 6f 75 74 70 75 | that `-|e' outpu|
|000072e0| 74 73 20 74 68 65 20 75 | 6e 69 6f 6e 20 6f 66 20 |ts the u|nion of |
|000072f0| 74 68 65 20 64 69 73 6a | 6f 69 6e 74 20 73 65 74 |the disj|oint set|
|00007300| 73 20 6f 66 0a 63 68 61 | 6e 67 65 73 20 6f 75 74 |s of.cha|nges out|
|00007310| 70 75 74 20 62 79 20 60 | 2d 33 27 20 61 6e 64 20 |put by `|-3' and |
|00007320| 60 2d 78 27 2e 0a 0a 20 | 20 20 4f 75 74 70 75 74 |`-x'... | Output|
|00007330| 20 6f 66 20 60 64 69 66 | 66 33 20 2d 65 20 6c 61 | of `dif|f3 -e la|
|00007340| 6f 20 74 7a 75 20 74 61 | 6f 27 3a 0a 20 20 20 20 |o tzu ta|o':. |
|00007350| 20 31 31 61 0a 20 20 20 | 20 20 0a 20 20 20 20 20 | 11a. | . |
|00007360| 20 20 2d 2d 20 54 68 65 | 20 57 61 79 20 6f 66 20 | -- The| Way of |
|00007370| 4c 61 6f 2d 54 7a 75 2c | 20 74 72 2e 20 57 69 6e |Lao-Tzu,| tr. Win|
|00007380| 67 2d 74 73 69 74 20 43 | 68 61 6e 0a 20 20 20 20 |g-tsit C|han. |
|00007390| 20 2e 0a 20 20 20 20 20 | 38 63 0a 20 20 20 20 20 | .. |8c. |
|000073a0| 20 20 73 6f 20 77 65 20 | 6d 61 79 20 73 65 65 20 | so we |may see |
|000073b0| 74 68 65 69 72 20 72 65 | 73 75 6c 74 2e 0a 20 20 |their re|sult.. |
|000073c0| 20 20 20 2e 0a 0a 20 20 | 20 4f 75 74 70 75 74 20 | ... | Output |
|000073d0| 6f 66 20 60 64 69 66 66 | 33 20 2d 33 20 6c 61 6f |of `diff|3 -3 lao|
|000073e0| 20 74 7a 75 20 74 61 6f | 27 3a 0a 20 20 20 20 20 | tzu tao|':. |
|000073f0| 38 63 0a 20 20 20 20 20 | 20 20 73 6f 20 77 65 20 |8c. | so we |
|00007400| 6d 61 79 20 73 65 65 20 | 74 68 65 69 72 20 72 65 |may see |their re|
|00007410| 73 75 6c 74 2e 0a 20 20 | 20 20 20 2e 0a 0a 20 20 |sult.. | ... |
|00007420| 20 4f 75 74 70 75 74 20 | 6f 66 20 60 64 69 66 66 | Output |of `diff|
|00007430| 33 20 2d 78 20 6c 61 6f | 20 74 7a 75 20 74 61 6f |3 -x lao| tzu tao|
|00007440| 27 3a 0a 20 20 20 20 20 | 31 31 61 0a 20 20 20 20 |':. |11a. |
|00007450| 20 0a 20 20 20 20 20 20 | 20 2d 2d 20 54 68 65 20 | . | -- The |
|00007460| 57 61 79 20 6f 66 20 4c | 61 6f 2d 54 7a 75 2c 20 |Way of L|ao-Tzu, |
|00007470| 74 72 2e 20 57 69 6e 67 | 2d 74 73 69 74 20 43 68 |tr. Wing|-tsit Ch|
|00007480| 61 6e 0a 20 20 20 20 20 | 2e 0a 0a 1f 0a 46 69 6c |an. |.....Fil|
|00007490| 65 3a 20 64 69 66 66 2e | 69 6e 66 6f 2c 20 20 4e |e: diff.|info, N|
|000074a0| 6f 64 65 3a 20 4d 61 72 | 6b 69 6e 67 20 43 6f 6e |ode: Mar|king Con|
|000074b0| 66 6c 69 63 74 73 2c 20 | 20 4e 65 78 74 3a 20 42 |flicts, | Next: B|
|000074c0| 79 70 61 73 73 69 6e 67 | 20 65 64 2c 20 20 50 72 |ypassing| ed, Pr|
|000074d0| 65 76 3a 20 57 68 69 63 | 68 20 43 68 61 6e 67 65 |ev: Whic|h Change|
|000074e0| 73 2c 20 20 55 70 3a 20 | 64 69 66 66 33 20 4d 65 |s, Up: |diff3 Me|
|000074f0| 72 67 69 6e 67 0a 0a 4d | 61 72 6b 69 6e 67 20 43 |rging..M|arking C|
|00007500| 6f 6e 66 6c 69 63 74 73 | 0a 3d 3d 3d 3d 3d 3d 3d |onflicts|.=======|
|00007510| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 0a 0a 20 20 20 60 |========|==.. `|
|00007520| 64 69 66 66 33 27 20 63 | 61 6e 20 6d 61 72 6b 20 |diff3' c|an mark |
|00007530| 63 6f 6e 66 6c 69 63 74 | 73 20 69 6e 20 74 68 65 |conflict|s in the|
|00007540| 20 6d 65 72 67 65 64 20 | 6f 75 74 70 75 74 20 62 | merged |output b|
|00007550| 79 20 62 72 61 63 6b 65 | 74 69 6e 67 20 74 68 65 |y bracke|ting the|
|00007560| 6d 0a 77 69 74 68 20 73 | 70 65 63 69 61 6c 20 6d |m.with s|pecial m|
|00007570| 61 72 6b 65 72 20 6c 69 | 6e 65 73 2e 20 20 41 20 |arker li|nes. A |
|00007580| 63 6f 6e 66 6c 69 63 74 | 20 74 68 61 74 20 63 6f |conflict| that co|
|00007590| 6d 65 73 20 66 72 6f 6d | 20 74 77 6f 20 66 69 6c |mes from| two fil|
|000075a0| 65 73 20 41 20 61 6e 64 | 0a 42 20 69 73 20 6d 61 |es A and|.B is ma|
|000075b0| 72 6b 65 64 20 61 73 20 | 66 6f 6c 6c 6f 77 73 3a |rked as |follows:|
|000075c0| 0a 0a 20 20 20 20 20 3c | 3c 3c 3c 3c 3c 3c 20 41 |.. <|<<<<<< A|
|000075d0| 0a 20 20 20 20 20 6c 69 | 6e 65 73 20 66 72 6f 6d |. li|nes from|
|000075e0| 20 41 0a 20 20 20 20 20 | 3d 3d 3d 3d 3d 3d 3d 0a | A. |=======.|
|000075f0| 20 20 20 20 20 6c 69 6e | 65 73 20 66 72 6f 6d 20 | lin|es from |
|00007600| 42 0a 20 20 20 20 20 3e | 3e 3e 3e 3e 3e 3e 20 42 |B. >|>>>>>> B|
|00007610| 0a 0a 20 20 20 41 20 63 | 6f 6e 66 6c 69 63 74 20 |.. A c|onflict |
|00007620| 74 68 61 74 20 63 6f 6d | 65 73 20 66 72 6f 6d 20 |that com|es from |
|00007630| 74 68 72 65 65 20 66 69 | 6c 65 73 20 41 2c 20 42 |three fi|les A, B|
|00007640| 20 61 6e 64 20 43 20 69 | 73 20 6d 61 72 6b 65 64 | and C i|s marked|
|00007650| 20 61 73 0a 66 6f 6c 6c | 6f 77 73 3a 0a 0a 20 20 | as.foll|ows:.. |
|00007660| 20 20 20 3c 3c 3c 3c 3c | 3c 3c 20 41 0a 20 20 20 | <<<<<|<< A. |
|00007670| 20 20 6c 69 6e 65 73 20 | 66 72 6f 6d 20 41 0a 20 | lines |from A. |
|00007680| 20 20 20 20 7c 7c 7c 7c | 7c 7c 7c 20 42 0a 20 20 | |||||||| B. |
|00007690| 20 20 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 42 0a | lines| from B.|
|000076a0| 20 20 20 20 20 3d 3d 3d | 3d 3d 3d 3d 0a 20 20 20 | ===|====. |
|000076b0| 20 20 6c 69 6e 65 73 20 | 66 72 6f 6d 20 43 0a 20 | lines |from C. |
|000076c0| 20 20 20 20 3e 3e 3e 3e | 3e 3e 3e 20 43 0a 0a 20 | >>>>|>>> C.. |
|000076d0| 20 20 54 68 65 20 60 2d | 41 27 20 6f 72 20 60 2d | The `-|A' or `-|
|000076e0| 2d 73 68 6f 77 2d 61 6c | 6c 27 20 6f 70 74 69 6f |-show-al|l' optio|
|000076f0| 6e 20 61 63 74 73 20 6c | 69 6b 65 20 74 68 65 20 |n acts l|ike the |
|00007700| 60 2d 65 27 20 6f 70 74 | 69 6f 6e 2c 20 65 78 63 |`-e' opt|ion, exc|
|00007710| 65 70 74 0a 74 68 61 74 | 20 69 74 20 62 72 61 63 |ept.that| it brac|
|00007720| 6b 65 74 73 20 63 6f 6e | 66 6c 69 63 74 73 2c 20 |kets con|flicts, |
|00007730| 61 6e 64 20 69 74 20 6f | 75 74 70 75 74 73 20 61 |and it o|utputs a|
|00007740| 6c 6c 20 63 68 61 6e 67 | 65 73 20 66 72 6f 6d 20 |ll chang|es from |
|00007750| 4f 4c 44 45 52 20 74 6f | 0a 59 4f 55 52 53 2c 20 |OLDER to|.YOURS, |
|00007760| 6e 6f 74 20 6a 75 73 74 | 20 74 68 65 20 75 6e 6d |not just| the unm|
|00007770| 65 72 67 65 64 20 63 68 | 61 6e 67 65 73 2e 20 20 |erged ch|anges. |
|00007780| 54 68 75 73 2c 20 67 69 | 76 65 6e 20 74 68 65 20 |Thus, gi|ven the |
|00007790| 73 61 6d 70 6c 65 20 69 | 6e 70 75 74 0a 66 69 6c |sample i|nput.fil|
|000077a0| 65 73 20 28 2a 6e 6f 74 | 65 20 53 61 6d 70 6c 65 |es (*not|e Sample|
|000077b0| 20 64 69 66 66 33 20 49 | 6e 70 75 74 3a 3a 2e 29 | diff3 I|nput::.)|
|000077c0| 2c 20 60 64 69 66 66 33 | 20 2d 41 20 6c 61 6f 20 |, `diff3| -A lao |
|000077d0| 74 7a 75 20 74 61 6f 27 | 20 70 75 74 73 0a 62 72 |tzu tao'| puts.br|
|000077e0| 61 63 6b 65 74 73 20 61 | 72 6f 75 6e 64 20 74 68 |ackets a|round th|
|000077f0| 65 20 63 6f 6e 66 6c 69 | 63 74 20 77 68 65 72 65 |e confli|ct where|
|00007800| 20 6f 6e 6c 79 20 60 74 | 7a 75 27 20 64 69 66 66 | only `t|zu' diff|
|00007810| 65 72 73 3a 0a 0a 20 20 | 20 20 20 3c 3c 3c 3c 3c |ers:.. | <<<<<|
|00007820| 3c 3c 20 74 7a 75 0a 20 | 20 20 20 20 3d 3d 3d 3d |<< tzu. | ====|
|00007830| 3d 3d 3d 0a 20 20 20 20 | 20 54 68 65 20 57 61 79 |===. | The Way|
|00007840| 20 74 68 61 74 20 63 61 | 6e 20 62 65 20 74 6f 6c | that ca|n be tol|
|00007850| 64 20 6f 66 20 69 73 20 | 6e 6f 74 20 74 68 65 20 |d of is |not the |
|00007860| 65 74 65 72 6e 61 6c 20 | 57 61 79 3b 0a 20 20 20 |eternal |Way;. |
|00007870| 20 20 54 68 65 20 6e 61 | 6d 65 20 74 68 61 74 20 | The na|me that |
|00007880| 63 61 6e 20 62 65 20 6e | 61 6d 65 64 20 69 73 20 |can be n|amed is |
|00007890| 6e 6f 74 20 74 68 65 20 | 65 74 65 72 6e 61 6c 20 |not the |eternal |
|000078a0| 6e 61 6d 65 2e 0a 20 20 | 20 20 20 3e 3e 3e 3e 3e |name.. | >>>>>|
|000078b0| 3e 3e 20 74 61 6f 0a 0a | 20 20 20 41 6e 64 20 69 |>> tao..| And i|
|000078c0| 74 20 6f 75 74 70 75 74 | 73 20 74 68 65 20 74 68 |t output|s the th|
|000078d0| 72 65 65 2d 77 61 79 20 | 63 6f 6e 66 6c 69 63 74 |ree-way |conflict|
|000078e0| 20 61 73 20 66 6f 6c 6c | 6f 77 73 3a 0a 0a 20 20 | as foll|ows:.. |
|000078f0| 20 20 20 3c 3c 3c 3c 3c | 3c 3c 20 6c 61 6f 0a 20 | <<<<<|<< lao. |
|00007900| 20 20 20 20 7c 7c 7c 7c | 7c 7c 7c 20 74 7a 75 0a | |||||||| tzu.|
|00007910| 20 20 20 20 20 54 68 65 | 79 20 62 6f 74 68 20 6d | The|y both m|
|00007920| 61 79 20 62 65 20 63 61 | 6c 6c 65 64 20 64 65 65 |ay be ca|lled dee|
|00007930| 70 20 61 6e 64 20 70 72 | 6f 66 6f 75 6e 64 2e 0a |p and pr|ofound..|
|00007940| 20 20 20 20 20 44 65 65 | 70 65 72 20 61 6e 64 20 | Dee|per and |
|00007950| 6d 6f 72 65 20 70 72 6f | 66 6f 75 6e 64 2c 0a 20 |more pro|found,. |
|00007960| 20 20 20 20 54 68 65 20 | 64 6f 6f 72 20 6f 66 20 | The |door of |
|00007970| 61 6c 6c 20 73 75 62 74 | 6c 65 74 69 65 73 21 0a |all subt|leties!.|
|00007980| 20 20 20 20 20 3d 3d 3d | 3d 3d 3d 3d 0a 20 20 20 | ===|====. |
|00007990| 20 20 0a 20 20 20 20 20 | 20 20 2d 2d 20 54 68 65 | . | -- The|
|000079a0| 20 57 61 79 20 6f 66 20 | 4c 61 6f 2d 54 7a 75 2c | Way of |Lao-Tzu,|
|000079b0| 20 74 72 2e 20 57 69 6e | 67 2d 74 73 69 74 20 43 | tr. Win|g-tsit C|
|000079c0| 68 61 6e 0a 20 20 20 20 | 20 3e 3e 3e 3e 3e 3e 3e |han. | >>>>>>>|
|000079d0| 20 74 61 6f 0a 0a 20 20 | 20 54 68 65 20 60 2d 45 | tao.. | The `-E|
|000079e0| 27 20 6f 72 20 60 2d 2d | 73 68 6f 77 2d 6f 76 65 |' or `--|show-ove|
|000079f0| 72 6c 61 70 27 20 6f 70 | 74 69 6f 6e 20 6f 75 74 |rlap' op|tion out|
|00007a00| 70 75 74 73 20 6c 65 73 | 73 20 69 6e 66 6f 72 6d |puts les|s inform|
|00007a10| 61 74 69 6f 6e 20 74 68 | 61 6e 0a 74 68 65 20 60 |ation th|an.the `|
|00007a20| 2d 41 27 20 6f 72 20 60 | 2d 2d 73 68 6f 77 2d 61 |-A' or `|--show-a|
|00007a30| 6c 6c 27 20 6f 70 74 69 | 6f 6e 2c 20 62 65 63 61 |ll' opti|on, beca|
|00007a40| 75 73 65 20 69 74 20 6f | 75 74 70 75 74 73 20 6f |use it o|utputs o|
|00007a50| 6e 6c 79 20 75 6e 6d 65 | 72 67 65 64 0a 63 68 61 |nly unme|rged.cha|
|00007a60| 6e 67 65 73 2c 20 61 6e | 64 20 69 74 20 6e 65 76 |nges, an|d it nev|
|00007a70| 65 72 20 6f 75 74 70 75 | 74 73 20 74 68 65 20 63 |er outpu|ts the c|
|00007a80| 6f 6e 74 65 6e 74 73 20 | 6f 66 20 74 68 65 20 73 |ontents |of the s|
|00007a90| 65 63 6f 6e 64 20 66 69 | 6c 65 2e 20 20 54 68 75 |econd fi|le. Thu|
|00007aa0| 73 0a 74 68 65 20 60 2d | 45 27 20 6f 70 74 69 6f |s.the `-|E' optio|
|00007ab0| 6e 20 61 63 74 73 20 6c | 69 6b 65 20 74 68 65 20 |n acts l|ike the |
|00007ac0| 60 2d 65 27 20 6f 70 74 | 69 6f 6e 2c 20 65 78 63 |`-e' opt|ion, exc|
|00007ad0| 65 70 74 20 74 68 61 74 | 20 69 74 20 62 72 61 63 |ept that| it brac|
|00007ae0| 6b 65 74 73 20 74 68 65 | 0a 66 69 72 73 74 20 61 |kets the|.first a|
|00007af0| 6e 64 20 74 68 69 72 64 | 20 66 69 6c 65 73 20 66 |nd third| files f|
|00007b00| 72 6f 6d 20 74 68 72 65 | 65 2d 77 61 79 20 6f 76 |rom thre|e-way ov|
|00007b10| 65 72 6c 61 70 70 69 6e | 67 20 63 68 61 6e 67 65 |erlappin|g change|
|00007b20| 73 2e 20 20 53 69 6d 69 | 6c 61 72 6c 79 2c 0a 60 |s. Simi|larly,.`|
|00007b30| 2d 58 27 20 61 63 74 73 | 20 6c 69 6b 65 20 60 2d |-X' acts| like `-|
|00007b40| 78 27 2c 20 65 78 63 65 | 70 74 20 69 74 20 62 72 |x', exce|pt it br|
|00007b50| 61 63 6b 65 74 73 20 61 | 6c 6c 20 69 74 73 20 28 |ackets a|ll its (|
|00007b60| 6e 65 63 65 73 73 61 72 | 69 6c 79 0a 6f 76 65 72 |necessar|ily.over|
|00007b70| 6c 61 70 70 69 6e 67 29 | 20 63 68 61 6e 67 65 73 |lapping)| changes|
|00007b80| 2e 20 20 46 6f 72 20 65 | 78 61 6d 70 6c 65 2c 20 |. For e|xample, |
|00007b90| 66 6f 72 20 74 68 65 20 | 74 68 72 65 65 2d 77 61 |for the |three-wa|
|00007ba0| 79 20 6f 76 65 72 6c 61 | 70 70 69 6e 67 0a 63 68 |y overla|pping.ch|
|00007bb0| 61 6e 67 65 20 61 62 6f | 76 65 2c 20 74 68 65 20 |ange abo|ve, the |
|00007bc0| 60 2d 45 27 20 61 6e 64 | 20 60 2d 58 27 20 6f 70 |`-E' and| `-X' op|
|00007bd0| 74 69 6f 6e 73 20 6f 75 | 74 70 75 74 20 74 68 65 |tions ou|tput the|
|00007be0| 20 66 6f 6c 6c 6f 77 69 | 6e 67 3a 0a 0a 20 20 20 | followi|ng:.. |
|00007bf0| 20 20 3c 3c 3c 3c 3c 3c | 3c 20 6c 61 6f 0a 20 20 | <<<<<<|< lao. |
|00007c00| 20 20 20 3d 3d 3d 3d 3d | 3d 3d 0a 20 20 20 20 20 | =====|==. |
|00007c10| 0a 20 20 20 20 20 20 20 | 2d 2d 20 54 68 65 20 57 |. |-- The W|
|00007c20| 61 79 20 6f 66 20 4c 61 | 6f 2d 54 7a 75 2c 20 74 |ay of La|o-Tzu, t|
|00007c30| 72 2e 20 57 69 6e 67 2d | 74 73 69 74 20 43 68 61 |r. Wing-|tsit Cha|
|00007c40| 6e 0a 20 20 20 20 20 3e | 3e 3e 3e 3e 3e 3e 20 74 |n. >|>>>>>> t|
|00007c50| 61 6f 0a 0a 20 20 20 49 | 66 20 79 6f 75 20 61 72 |ao.. I|f you ar|
|00007c60| 65 20 63 6f 6d 70 61 72 | 69 6e 67 20 66 69 6c 65 |e compar|ing file|
|00007c70| 73 20 74 68 61 74 20 68 | 61 76 65 20 6d 65 61 6e |s that h|ave mean|
|00007c80| 69 6e 67 6c 65 73 73 20 | 6f 72 20 75 6e 69 6e 66 |ingless |or uninf|
|00007c90| 6f 72 6d 61 74 69 76 65 | 0a 6e 61 6d 65 73 2c 20 |ormative|.names, |
|00007ca0| 79 6f 75 20 63 61 6e 20 | 75 73 65 20 74 68 65 20 |you can |use the |
|00007cb0| 60 2d 4c 20 4c 41 42 45 | 4c 27 20 6f 72 20 60 2d |`-L LABE|L' or `-|
|00007cc0| 2d 6c 61 62 65 6c 3d 4c | 41 42 45 4c 27 20 6f 70 |-label=L|ABEL' op|
|00007cd0| 74 69 6f 6e 20 74 6f 20 | 73 68 6f 77 0a 61 6c 74 |tion to |show.alt|
|00007ce0| 65 72 6e 61 74 65 20 6e | 61 6d 65 73 20 69 6e 20 |ernate n|ames in |
|00007cf0| 74 68 65 20 60 3c 3c 3c | 3c 3c 3c 3c 27 2c 20 60 |the `<<<|<<<<', `|
|00007d00| 7c 7c 7c 7c 7c 7c 7c 27 | 20 61 6e 64 20 60 3e 3e ||||||||'| and `>>|
|00007d10| 3e 3e 3e 3e 3e 27 20 62 | 72 61 63 6b 65 74 73 2e |>>>>>' b|rackets.|
|00007d20| 0a 54 68 69 73 20 6f 70 | 74 69 6f 6e 20 63 61 6e |.This op|tion can|
|00007d30| 20 62 65 20 67 69 76 65 | 6e 20 75 70 20 74 6f 20 | be give|n up to |
|00007d40| 74 68 72 65 65 20 74 69 | 6d 65 73 2c 20 6f 6e 63 |three ti|mes, onc|
|00007d50| 65 20 66 6f 72 20 65 61 | 63 68 20 69 6e 70 75 74 |e for ea|ch input|
|00007d60| 20 66 69 6c 65 2e 0a 54 | 68 75 73 20 60 64 69 66 | file..T|hus `dif|
|00007d70| 66 33 20 2d 41 20 2d 4c | 20 58 20 2d 4c 20 59 20 |f3 -A -L| X -L Y |
|00007d80| 2d 4c 20 5a 20 41 20 42 | 20 43 27 20 61 63 74 73 |-L Z A B| C' acts|
|00007d90| 20 6c 69 6b 65 20 60 64 | 69 66 66 33 20 2d 41 20 | like `d|iff3 -A |
|00007da0| 41 20 42 20 43 27 2c 20 | 65 78 63 65 70 74 0a 74 |A B C', |except.t|
|00007db0| 68 61 74 20 74 68 65 20 | 6f 75 74 70 75 74 20 6c |hat the |output l|
|00007dc0| 6f 6f 6b 73 20 6c 69 6b | 65 20 69 74 20 63 61 6d |ooks lik|e it cam|
|00007dd0| 65 20 66 72 6f 6d 20 66 | 69 6c 65 73 20 6e 61 6d |e from f|iles nam|
|00007de0| 65 64 20 60 58 27 2c 20 | 60 59 27 20 61 6e 64 20 |ed `X', |`Y' and |
|00007df0| 60 5a 27 0a 72 61 74 68 | 65 72 20 74 68 61 6e 20 |`Z'.rath|er than |
|00007e00| 66 72 6f 6d 20 66 69 6c | 65 73 20 6e 61 6d 65 64 |from fil|es named|
|00007e10| 20 60 41 27 2c 20 60 42 | 27 20 61 6e 64 20 60 43 | `A', `B|' and `C|
|00007e20| 27 2e 0a 0a 1f 0a 46 69 | 6c 65 3a 20 64 69 66 66 |'.....Fi|le: diff|
|00007e30| 2e 69 6e 66 6f 2c 20 20 | 4e 6f 64 65 3a 20 42 79 |.info, |Node: By|
|00007e40| 70 61 73 73 69 6e 67 20 | 65 64 2c 20 20 4e 65 78 |passing |ed, Nex|
|00007e50| 74 3a 20 4d 65 72 67 69 | 6e 67 20 49 6e 63 6f 6d |t: Mergi|ng Incom|
|00007e60| 70 6c 65 74 65 20 4c 69 | 6e 65 73 2c 20 20 50 72 |plete Li|nes, Pr|
|00007e70| 65 76 3a 20 4d 61 72 6b | 69 6e 67 20 43 6f 6e 66 |ev: Mark|ing Conf|
|00007e80| 6c 69 63 74 73 2c 20 20 | 55 70 3a 20 64 69 66 66 |licts, |Up: diff|
|00007e90| 33 20 4d 65 72 67 69 6e | 67 0a 0a 47 65 6e 65 72 |3 Mergin|g..Gener|
|00007ea0| 61 74 69 6e 67 20 74 68 | 65 20 4d 65 72 67 65 64 |ating th|e Merged|
|00007eb0| 20 4f 75 74 70 75 74 20 | 44 69 72 65 63 74 6c 79 | Output |Directly|
|00007ec0| 0a 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |.=======|========|
|00007ed0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00007ee0| 3d 3d 3d 3d 3d 3d 0a 0a | 20 20 20 57 69 74 68 20 |======..| With |
|00007ef0| 74 68 65 20 60 2d 6d 27 | 20 6f 72 20 60 2d 2d 6d |the `-m'| or `--m|
|00007f00| 65 72 67 65 27 20 6f 70 | 74 69 6f 6e 2c 20 60 64 |erge' op|tion, `d|
|00007f10| 69 66 66 33 27 20 6f 75 | 74 70 75 74 73 20 74 68 |iff3' ou|tputs th|
|00007f20| 65 20 6d 65 72 67 65 64 | 20 66 69 6c 65 0a 64 69 |e merged| file.di|
|00007f30| 72 65 63 74 6c 79 2e 20 | 20 54 68 69 73 20 69 73 |rectly. | This is|
|00007f40| 20 6d 6f 72 65 20 65 66 | 66 69 63 69 65 6e 74 20 | more ef|ficient |
|00007f50| 74 68 61 6e 20 75 73 69 | 6e 67 20 60 65 64 27 20 |than usi|ng `ed' |
|00007f60| 74 6f 20 67 65 6e 65 72 | 61 74 65 20 69 74 2c 20 |to gener|ate it, |
|00007f70| 61 6e 64 0a 77 6f 72 6b | 73 20 65 76 65 6e 20 77 |and.work|s even w|
|00007f80| 69 74 68 20 6e 6f 6e 2d | 74 65 78 74 20 66 69 6c |ith non-|text fil|
|00007f90| 65 73 20 74 68 61 74 20 | 60 65 64 27 20 77 6f 75 |es that |`ed' wou|
|00007fa0| 6c 64 20 72 65 6a 65 63 | 74 2e 20 20 49 66 20 79 |ld rejec|t. If y|
|00007fb0| 6f 75 20 73 70 65 63 69 | 66 79 0a 60 2d 6d 27 20 |ou speci|fy.`-m' |
|00007fc0| 77 69 74 68 6f 75 74 20 | 61 6e 20 60 65 64 27 20 |without |an `ed' |
|00007fd0| 73 63 72 69 70 74 20 6f | 70 74 69 6f 6e 2c 20 60 |script o|ption, `|
|00007fe0| 2d 41 27 20 28 60 2d 2d | 73 68 6f 77 2d 61 6c 6c |-A' (`--|show-all|
|00007ff0| 27 29 20 69 73 20 61 73 | 73 75 6d 65 64 2e 0a 0a |') is as|sumed...|
|00008000| 20 20 20 46 6f 72 20 65 | 78 61 6d 70 6c 65 2c 20 | For e|xample, |
|00008010| 74 68 65 20 63 6f 6d 6d | 61 6e 64 20 60 64 69 66 |the comm|and `dif|
|00008020| 66 33 20 2d 6d 20 6c 61 | 6f 20 74 7a 75 20 74 61 |f3 -m la|o tzu ta|
|00008030| 6f 27 20 28 2a 6e 6f 74 | 65 20 53 61 6d 70 6c 65 |o' (*not|e Sample|
|00008040| 20 64 69 66 66 33 0a 49 | 6e 70 75 74 3a 3a 2e 20 | diff3.I|nput::. |
|00008050| 66 6f 72 20 61 20 63 6f | 70 79 20 6f 66 20 74 68 |for a co|py of th|
|00008060| 65 20 69 6e 70 75 74 20 | 66 69 6c 65 73 29 20 77 |e input |files) w|
|00008070| 6f 75 6c 64 20 6f 75 74 | 70 75 74 20 74 68 65 20 |ould out|put the |
|00008080| 66 6f 6c 6c 6f 77 69 6e | 67 3a 0a 0a 20 20 20 20 |followin|g:.. |
|00008090| 20 3c 3c 3c 3c 3c 3c 3c | 20 74 7a 75 0a 20 20 20 | <<<<<<<| tzu. |
|000080a0| 20 20 3d 3d 3d 3d 3d 3d | 3d 0a 20 20 20 20 20 54 | ======|=. T|
|000080b0| 68 65 20 57 61 79 20 74 | 68 61 74 20 63 61 6e 20 |he Way t|hat can |
|000080c0| 62 65 20 74 6f 6c 64 20 | 6f 66 20 69 73 20 6e 6f |be told |of is no|
|000080d0| 74 20 74 68 65 20 65 74 | 65 72 6e 61 6c 20 57 61 |t the et|ernal Wa|
|000080e0| 79 3b 0a 20 20 20 20 20 | 54 68 65 20 6e 61 6d 65 |y;. |The name|
|000080f0| 20 74 68 61 74 20 63 61 | 6e 20 62 65 20 6e 61 6d | that ca|n be nam|
|00008100| 65 64 20 69 73 20 6e 6f | 74 20 74 68 65 20 65 74 |ed is no|t the et|
|00008110| 65 72 6e 61 6c 20 6e 61 | 6d 65 2e 0a 20 20 20 20 |ernal na|me.. |
|00008120| 20 3e 3e 3e 3e 3e 3e 3e | 20 74 61 6f 0a 20 20 20 | >>>>>>>| tao. |
|00008130| 20 20 54 68 65 20 4e 61 | 6d 65 6c 65 73 73 20 69 | The Na|meless i|
|00008140| 73 20 74 68 65 20 6f 72 | 69 67 69 6e 20 6f 66 20 |s the or|igin of |
|00008150| 48 65 61 76 65 6e 20 61 | 6e 64 20 45 61 72 74 68 |Heaven a|nd Earth|
|00008160| 3b 0a 20 20 20 20 20 54 | 68 65 20 4e 61 6d 65 64 |;. T|he Named|
|00008170| 20 69 73 20 74 68 65 20 | 6d 6f 74 68 65 72 20 6f | is the |mother o|
|00008180| 66 20 61 6c 6c 20 74 68 | 69 6e 67 73 2e 0a 20 20 |f all th|ings.. |
|00008190| 20 20 20 54 68 65 72 65 | 66 6f 72 65 20 6c 65 74 | There|fore let|
|000081a0| 20 74 68 65 72 65 20 61 | 6c 77 61 79 73 20 62 65 | there a|lways be|
|000081b0| 20 6e 6f 6e 2d 62 65 69 | 6e 67 2c 0a 20 20 20 20 | non-bei|ng,. |
|000081c0| 20 20 20 73 6f 20 77 65 | 20 6d 61 79 20 73 65 65 | so we| may see|
|000081d0| 20 74 68 65 69 72 20 73 | 75 62 74 6c 65 74 79 2c | their s|ubtlety,|
|000081e0| 0a 20 20 20 20 20 41 6e | 64 20 6c 65 74 20 74 68 |. An|d let th|
|000081f0| 65 72 65 20 61 6c 77 61 | 79 73 20 62 65 20 62 65 |ere alwa|ys be be|
|00008200| 69 6e 67 2c 0a 20 20 20 | 20 20 20 20 73 6f 20 77 |ing,. | so w|
|00008210| 65 20 6d 61 79 20 73 65 | 65 20 74 68 65 69 72 20 |e may se|e their |
|00008220| 72 65 73 75 6c 74 2e 0a | 20 20 20 20 20 54 68 65 |result..| The|
|00008230| 20 74 77 6f 20 61 72 65 | 20 74 68 65 20 73 61 6d | two are| the sam|
|00008240| 65 2c 0a 20 20 20 20 20 | 42 75 74 20 61 66 74 65 |e,. |But afte|
|00008250| 72 20 74 68 65 79 20 61 | 72 65 20 70 72 6f 64 75 |r they a|re produ|
|00008260| 63 65 64 2c 0a 20 20 20 | 20 20 20 20 74 68 65 79 |ced,. | they|
|00008270| 20 68 61 76 65 20 64 69 | 66 66 65 72 65 6e 74 20 | have di|fferent |
|00008280| 6e 61 6d 65 73 2e 0a 20 | 20 20 20 20 3c 3c 3c 3c |names.. | <<<<|
|00008290| 3c 3c 3c 20 6c 61 6f 0a | 20 20 20 20 20 7c 7c 7c |<<< lao.| ||||
|000082a0| 7c 7c 7c 7c 20 74 7a 75 | 0a 20 20 20 20 20 54 68 ||||| tzu|. Th|
|000082b0| 65 79 20 62 6f 74 68 20 | 6d 61 79 20 62 65 20 63 |ey both |may be c|
|000082c0| 61 6c 6c 65 64 20 64 65 | 65 70 20 61 6e 64 20 70 |alled de|ep and p|
|000082d0| 72 6f 66 6f 75 6e 64 2e | 0a 20 20 20 20 20 44 65 |rofound.|. De|
|000082e0| 65 70 65 72 20 61 6e 64 | 20 6d 6f 72 65 20 70 72 |eper and| more pr|
|000082f0| 6f 66 6f 75 6e 64 2c 0a | 20 20 20 20 20 54 68 65 |ofound,.| The|
|00008300| 20 64 6f 6f 72 20 6f 66 | 20 61 6c 6c 20 73 75 62 | door of| all sub|
|00008310| 74 6c 65 74 69 65 73 21 | 0a 20 20 20 20 20 3d 3d |tleties!|. ==|
|00008320| 3d 3d 3d 3d 3d 0a 20 20 | 20 20 20 0a 20 20 20 20 |=====. | . |
|00008330| 20 20 20 2d 2d 20 54 68 | 65 20 57 61 79 20 6f 66 | -- Th|e Way of|
|00008340| 20 4c 61 6f 2d 54 7a 75 | 2c 20 74 72 2e 20 57 69 | Lao-Tzu|, tr. Wi|
|00008350| 6e 67 2d 74 73 69 74 20 | 43 68 61 6e 0a 20 20 20 |ng-tsit |Chan. |
|00008360| 20 20 3e 3e 3e 3e 3e 3e | 3e 20 74 61 6f 0a 0a 1f | >>>>>>|> tao...|
|00008370| 0a 46 69 6c 65 3a 20 64 | 69 66 66 2e 69 6e 66 6f |.File: d|iff.info|
|00008380| 2c 20 20 4e 6f 64 65 3a | 20 4d 65 72 67 69 6e 67 |, Node:| Merging|
|00008390| 20 49 6e 63 6f 6d 70 6c | 65 74 65 20 4c 69 6e 65 | Incompl|ete Line|
|000083a0| 73 2c 20 20 4e 65 78 74 | 3a 20 53 61 76 69 6e 67 |s, Next|: Saving|
|000083b0| 20 74 68 65 20 43 68 61 | 6e 67 65 64 20 46 69 6c | the Cha|nged Fil|
|000083c0| 65 2c 20 20 50 72 65 76 | 3a 20 42 79 70 61 73 73 |e, Prev|: Bypass|
|000083d0| 69 6e 67 20 65 64 2c 20 | 20 55 70 3a 20 64 69 66 |ing ed, | Up: dif|
|000083e0| 66 33 20 4d 65 72 67 69 | 6e 67 0a 0a 48 6f 77 20 |f3 Mergi|ng..How |
|000083f0| 60 64 69 66 66 33 27 20 | 4d 65 72 67 65 73 20 49 |`diff3' |Merges I|
|00008400| 6e 63 6f 6d 70 6c 65 74 | 65 20 4c 69 6e 65 73 0a |ncomplet|e Lines.|
|00008410| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00008420| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00008430| 3d 3d 3d 0a 0a 20 20 20 | 57 69 74 68 20 60 2d 6d |===.. |With `-m|
|00008440| 27 2c 20 69 6e 63 6f 6d | 70 6c 65 74 65 20 6c 69 |', incom|plete li|
|00008450| 6e 65 73 20 28 2a 6e 6f | 74 65 20 49 6e 63 6f 6d |nes (*no|te Incom|
|00008460| 70 6c 65 74 65 20 4c 69 | 6e 65 73 3a 3a 2e 29 20 |plete Li|nes::.) |
|00008470| 61 72 65 20 73 69 6d 70 | 6c 79 0a 63 6f 70 69 65 |are simp|ly.copie|
|00008480| 64 20 74 6f 20 74 68 65 | 20 6f 75 74 70 75 74 20 |d to the| output |
|00008490| 61 73 20 74 68 65 79 20 | 61 72 65 20 66 6f 75 6e |as they |are foun|
|000084a0| 64 3b 20 69 66 20 74 68 | 65 20 6d 65 72 67 65 64 |d; if th|e merged|
|000084b0| 20 6f 75 74 70 75 74 20 | 65 6e 64 73 20 69 6e 20 | output |ends in |
|000084c0| 61 6e 0a 63 6f 6e 66 6c | 69 63 74 20 61 6e 64 20 |an.confl|ict and |
|000084d0| 6f 6e 65 20 6f 66 20 74 | 68 65 20 69 6e 70 75 74 |one of t|he input|
|000084e0| 20 66 69 6c 65 73 20 65 | 6e 64 73 20 69 6e 20 61 | files e|nds in a|
|000084f0| 6e 20 69 6e 63 6f 6d 70 | 6c 65 74 65 20 6c 69 6e |n incomp|lete lin|
|00008500| 65 2c 0a 73 75 63 63 65 | 65 64 69 6e 67 20 60 7c |e,.succe|eding `||
|00008510| 7c 7c 7c 7c 7c 7c 27 2c | 20 60 3d 3d 3d 3d 3d 3d |||||||',| `======|
|00008520| 3d 27 20 6f 72 20 60 3e | 3e 3e 3e 3e 3e 3e 27 20 |=' or `>|>>>>>>' |
|00008530| 62 72 61 63 6b 65 74 73 | 20 61 70 70 65 61 72 20 |brackets| appear |
|00008540| 73 6f 6d 65 77 68 65 72 | 65 0a 6f 74 68 65 72 20 |somewher|e.other |
|00008550| 74 68 61 6e 20 74 68 65 | 20 73 74 61 72 74 20 6f |than the| start o|
|00008560| 66 20 61 20 6c 69 6e 65 | 20 62 65 63 61 75 73 65 |f a line| because|
|00008570| 20 74 68 65 79 20 61 72 | 65 20 61 70 70 65 6e 64 | they ar|e append|
|00008580| 65 64 20 74 6f 20 74 68 | 65 0a 69 6e 63 6f 6d 70 |ed to th|e.incomp|
|00008590| 6c 65 74 65 20 6c 69 6e | 65 2e 0a 0a 20 20 20 57 |lete lin|e... W|
|000085a0| 69 74 68 6f 75 74 20 60 | 2d 6d 27 2c 20 69 66 20 |ithout `|-m', if |
|000085b0| 61 6e 20 60 65 64 27 20 | 73 63 72 69 70 74 20 6f |an `ed' |script o|
|000085c0| 70 74 69 6f 6e 20 69 73 | 20 73 70 65 63 69 66 69 |ption is| specifi|
|000085d0| 65 64 20 61 6e 64 20 61 | 6e 0a 69 6e 63 6f 6d 70 |ed and a|n.incomp|
|000085e0| 6c 65 74 65 20 6c 69 6e | 65 20 69 73 20 66 6f 75 |lete lin|e is fou|
|000085f0| 6e 64 2c 20 60 64 69 66 | 66 33 27 20 67 65 6e 65 |nd, `dif|f3' gene|
|00008600| 72 61 74 65 73 20 61 20 | 77 61 72 6e 69 6e 67 20 |rates a |warning |
|00008610| 61 6e 64 20 61 63 74 73 | 20 61 73 20 69 66 20 61 |and acts| as if a|
|00008620| 0a 6e 65 77 6c 69 6e 65 | 20 68 61 64 20 62 65 65 |.newline| had bee|
|00008630| 6e 20 70 72 65 73 65 6e | 74 2e 0a 0a 1f 0a 46 69 |n presen|t.....Fi|
|00008640| 6c 65 3a 20 64 69 66 66 | 2e 69 6e 66 6f 2c 20 20 |le: diff|.info, |
|00008650| 4e 6f 64 65 3a 20 53 61 | 76 69 6e 67 20 74 68 65 |Node: Sa|ving the|
|00008660| 20 43 68 61 6e 67 65 64 | 20 46 69 6c 65 2c 20 20 | Changed| File, |
|00008670| 50 72 65 76 3a 20 4d 65 | 72 67 69 6e 67 20 49 6e |Prev: Me|rging In|
|00008680| 63 6f 6d 70 6c 65 74 65 | 20 4c 69 6e 65 73 2c 20 |complete| Lines, |
|00008690| 20 55 70 3a 20 64 69 66 | 66 33 20 4d 65 72 67 69 | Up: dif|f3 Mergi|
|000086a0| 6e 67 0a 0a 53 61 76 69 | 6e 67 20 74 68 65 20 43 |ng..Savi|ng the C|
|000086b0| 68 61 6e 67 65 64 20 46 | 69 6c 65 0a 3d 3d 3d 3d |hanged F|ile.====|
|000086c0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000086d0| 3d 3d 3d 0a 0a 20 20 20 | 54 72 61 64 69 74 69 6f |===.. |Traditio|
|000086e0| 6e 61 6c 20 55 6e 69 78 | 20 60 64 69 66 66 33 27 |nal Unix| `diff3'|
|000086f0| 20 67 65 6e 65 72 61 74 | 65 73 20 61 6e 20 60 65 | generat|es an `e|
|00008700| 64 27 20 73 63 72 69 70 | 74 20 77 69 74 68 6f 75 |d' scrip|t withou|
|00008710| 74 20 74 68 65 0a 74 72 | 61 69 6c 69 6e 67 20 60 |t the.tr|ailing `|
|00008720| 77 27 20 61 6e 64 20 61 | 6e 64 20 60 71 27 20 63 |w' and a|nd `q' c|
|00008730| 6f 6d 6d 61 6e 64 73 20 | 74 68 61 74 20 73 61 76 |ommands |that sav|
|00008740| 65 20 74 68 65 20 63 68 | 61 6e 67 65 73 2e 20 20 |e the ch|anges. |
|00008750| 53 79 73 74 65 6d 20 56 | 0a 60 64 69 66 66 33 27 |System V|.`diff3'|
|00008760| 20 67 65 6e 65 72 61 74 | 65 73 20 74 68 65 73 65 | generat|es these|
|00008770| 20 65 78 74 72 61 20 63 | 6f 6d 6d 61 6e 64 73 2e | extra c|ommands.|
|00008780| 20 20 47 4e 55 20 60 64 | 69 66 66 33 27 20 6e 6f | GNU `d|iff3' no|
|00008790| 72 6d 61 6c 6c 79 20 62 | 65 68 61 76 65 73 0a 6c |rmally b|ehaves.l|
|000087a0| 69 6b 65 20 74 72 61 64 | 69 74 69 6f 6e 61 6c 20 |ike trad|itional |
|000087b0| 55 6e 69 78 20 60 64 69 | 66 66 33 27 2c 20 62 75 |Unix `di|ff3', bu|
|000087c0| 74 20 77 69 74 68 20 74 | 68 65 20 60 2d 69 27 20 |t with t|he `-i' |
|000087d0| 6f 70 74 69 6f 6e 20 69 | 74 20 62 65 68 61 76 65 |option i|t behave|
|000087e0| 73 20 6c 69 6b 65 0a 53 | 79 73 74 65 6d 20 56 20 |s like.S|ystem V |
|000087f0| 60 64 69 66 66 33 27 20 | 61 6e 64 20 61 70 70 65 |`diff3' |and appe|
|00008800| 6e 64 73 20 74 68 65 20 | 60 77 27 20 61 6e 64 20 |nds the |`w' and |
|00008810| 60 71 27 20 63 6f 6d 6d | 61 6e 64 73 2e 0a 0a 20 |`q' comm|ands... |
|00008820| 20 20 54 68 65 20 60 2d | 69 27 20 6f 70 74 69 6f | The `-|i' optio|
|00008830| 6e 20 72 65 71 75 69 72 | 65 73 20 6f 6e 65 20 6f |n requir|es one o|
|00008840| 66 20 74 68 65 20 60 65 | 64 27 20 73 63 72 69 70 |f the `e|d' scrip|
|00008850| 74 20 6f 70 74 69 6f 6e | 73 20 60 2d 41 65 45 78 |t option|s `-AeEx|
|00008860| 58 33 27 2c 0a 61 6e 64 | 20 69 73 20 69 6e 63 6f |X3',.and| is inco|
|00008870| 6d 70 61 74 69 62 6c 65 | 20 77 69 74 68 20 74 68 |mpatible| with th|
|00008880| 65 20 6d 65 72 67 65 64 | 20 6f 75 74 70 75 74 20 |e merged| output |
|00008890| 6f 70 74 69 6f 6e 20 60 | 2d 6d 27 2e 0a 0a 1f 0a |option `|-m'.....|
|000088a0| 46 69 6c 65 3a 20 64 69 | 66 66 2e 69 6e 66 6f 2c |File: di|ff.info,|
|000088b0| 20 20 4e 6f 64 65 3a 20 | 49 6e 74 65 72 61 63 74 | Node: |Interact|
|000088c0| 69 76 65 20 4d 65 72 67 | 69 6e 67 2c 20 20 4e 65 |ive Merg|ing, Ne|
|000088d0| 78 74 3a 20 4d 65 72 67 | 69 6e 67 20 77 69 74 68 |xt: Merg|ing with|
|000088e0| 20 70 61 74 63 68 2c 20 | 20 50 72 65 76 3a 20 64 | patch, | Prev: d|
|000088f0| 69 66 66 33 20 4d 65 72 | 67 69 6e 67 2c 20 20 55 |iff3 Mer|ging, U|
|00008900| 70 3a 20 54 6f 70 0a 0a | 49 6e 74 65 72 61 63 74 |p: Top..|Interact|
|00008910| 69 76 65 20 4d 65 72 67 | 69 6e 67 20 77 69 74 68 |ive Merg|ing with|
|00008920| 20 60 73 64 69 66 66 27 | 0a 2a 2a 2a 2a 2a 2a 2a | `sdiff'|.*******|
|00008930| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |********|********|
|00008940| 2a 2a 2a 2a 2a 2a 2a 2a | 2a 0a 0a 20 20 20 57 69 |********|*.. Wi|
|00008950| 74 68 20 60 73 64 69 66 | 66 27 2c 20 79 6f 75 20 |th `sdif|f', you |
|00008960| 63 61 6e 20 6d 65 72 67 | 65 20 74 77 6f 20 66 69 |can merg|e two fi|
|00008970| 6c 65 73 20 69 6e 74 65 | 72 61 63 74 69 76 65 6c |les inte|ractivel|
|00008980| 79 20 62 61 73 65 64 20 | 6f 6e 20 61 0a 73 69 64 |y based |on a.sid|
|00008990| 65 2d 62 79 2d 73 69 64 | 65 20 60 2d 79 27 20 66 |e-by-sid|e `-y' f|
|000089a0| 6f 72 6d 61 74 20 63 6f | 6d 70 61 72 69 73 6f 6e |ormat co|mparison|
|000089b0| 20 28 2a 6e 6f 74 65 20 | 53 69 64 65 20 62 79 20 | (*note |Side by |
|000089c0| 53 69 64 65 3a 3a 2e 29 | 2e 20 20 55 73 65 20 60 |Side::.)|. Use `|
|000089d0| 2d 6f 0a 46 49 4c 45 27 | 20 6f 72 20 60 2d 2d 6f |-o.FILE'| or `--o|
|000089e0| 75 74 70 75 74 3d 46 49 | 4c 45 27 20 74 6f 20 73 |utput=FI|LE' to s|
|000089f0| 70 65 63 69 66 79 20 77 | 68 65 72 65 20 74 6f 20 |pecify w|here to |
|00008a00| 70 75 74 20 74 68 65 20 | 6d 65 72 67 65 64 20 74 |put the |merged t|
|00008a10| 65 78 74 2e 0a 2a 4e 6f | 74 65 20 49 6e 76 6f 6b |ext..*No|te Invok|
|00008a20| 69 6e 67 20 73 64 69 66 | 66 3a 3a 2c 20 66 6f 72 |ing sdif|f::, for|
|00008a30| 20 6d 6f 72 65 20 64 65 | 74 61 69 6c 73 20 6f 6e | more de|tails on|
|00008a40| 20 74 68 65 20 6f 70 74 | 69 6f 6e 73 20 74 6f 20 | the opt|ions to |
|00008a50| 60 73 64 69 66 66 27 2e | 0a 0a 20 20 20 41 6e 6f |`sdiff'.|.. Ano|
|00008a60| 74 68 65 72 20 77 61 79 | 20 74 6f 20 6d 65 72 67 |ther way| to merg|
|00008a70| 65 20 66 69 6c 65 73 20 | 69 6e 74 65 72 61 63 74 |e files |interact|
|00008a80| 69 76 65 6c 79 20 69 73 | 20 74 6f 20 75 73 65 20 |ively is| to use |
|00008a90| 74 68 65 20 45 6d 61 63 | 73 20 4c 69 73 70 0a 70 |the Emac|s Lisp.p|
|00008aa0| 61 63 6b 61 67 65 20 60 | 65 6d 65 72 67 65 27 2e |ackage `|emerge'.|
|00008ab0| 20 20 2a 4e 6f 74 65 20 | 65 6d 65 72 67 65 3a 20 | *Note |emerge: |
|00008ac0| 28 65 6d 61 63 73 29 65 | 6d 65 72 67 65 2c 20 66 |(emacs)e|merge, f|
|00008ad0| 6f 72 20 6d 6f 72 65 20 | 69 6e 66 6f 72 6d 61 74 |or more |informat|
|00008ae0| 69 6f 6e 2e 0a 0a 2a 20 | 4d 65 6e 75 3a 0a 0a 2a |ion...* |Menu:..*|
|00008af0| 20 73 64 69 66 66 20 4f | 70 74 69 6f 6e 20 53 75 | sdiff O|ption Su|
|00008b00| 6d 6d 61 72 79 3a 3a 53 | 75 6d 6d 61 72 79 20 6f |mmary::S|ummary o|
|00008b10| 66 20 60 73 64 69 66 66 | 27 20 6f 70 74 69 6f 6e |f `sdiff|' option|
|00008b20| 73 2e 0a 2a 20 4d 65 72 | 67 65 20 43 6f 6d 6d 61 |s..* Mer|ge Comma|
|00008b30| 6e 64 73 3a 3a 09 4d 65 | 72 67 69 6e 67 20 74 77 |nds::.Me|rging tw|
|00008b40| 6f 20 66 69 6c 65 73 20 | 69 6e 74 65 72 61 63 74 |o files |interact|
|00008b50| 69 76 65 6c 79 2e 0a 0a | 1f 0a 46 69 6c 65 3a 20 |ively...|..File: |
|00008b60| 64 69 66 66 2e 69 6e 66 | 6f 2c 20 20 4e 6f 64 65 |diff.inf|o, Node|
|00008b70| 3a 20 73 64 69 66 66 20 | 4f 70 74 69 6f 6e 20 53 |: sdiff |Option S|
|00008b80| 75 6d 6d 61 72 79 2c 20 | 20 4e 65 78 74 3a 20 4d |ummary, | Next: M|
|00008b90| 65 72 67 65 20 43 6f 6d | 6d 61 6e 64 73 2c 20 20 |erge Com|mands, |
|00008ba0| 55 70 3a 20 49 6e 74 65 | 72 61 63 74 69 76 65 20 |Up: Inte|ractive |
|00008bb0| 4d 65 72 67 69 6e 67 0a | 0a 53 70 65 63 69 66 79 |Merging.|.Specify|
|00008bc0| 69 6e 67 20 60 64 69 66 | 66 27 20 4f 70 74 69 6f |ing `dif|f' Optio|
|00008bd0| 6e 73 20 74 6f 20 60 73 | 64 69 66 66 27 0a 3d 3d |ns to `s|diff'.==|
|00008be0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00008bf0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00008c00| 3d 3d 0a 0a 20 20 20 54 | 68 65 20 66 6f 6c 6c 6f |==.. T|he follo|
|00008c10| 77 69 6e 67 20 60 73 64 | 69 66 66 27 20 6f 70 74 |wing `sd|iff' opt|
|00008c20| 69 6f 6e 73 20 68 61 76 | 65 20 74 68 65 20 73 61 |ions hav|e the sa|
|00008c30| 6d 65 20 6d 65 61 6e 69 | 6e 67 20 61 73 20 66 6f |me meani|ng as fo|
|00008c40| 72 20 60 64 69 66 66 27 | 2e 0a 2a 4e 6f 74 65 20 |r `diff'|..*Note |
|00008c50| 64 69 66 66 20 4f 70 74 | 69 6f 6e 73 3a 3a 2c 20 |diff Opt|ions::, |
|00008c60| 66 6f 72 20 74 68 65 20 | 75 73 65 20 6f 66 20 74 |for the |use of t|
|00008c70| 68 65 73 65 20 6f 70 74 | 69 6f 6e 73 2e 0a 0a 20 |hese opt|ions... |
|00008c80| 20 20 20 20 2d 61 20 2d | 62 20 2d 64 20 2d 69 20 | -a -|b -d -i |
|00008c90| 2d 74 20 2d 76 0a 20 20 | 20 20 20 2d 42 20 2d 48 |-t -v. | -B -H|
|00008ca0| 20 2d 49 20 52 45 47 45 | 58 50 0a 20 20 20 20 20 | -I REGE|XP. |
|00008cb0| 0a 20 20 20 20 20 2d 2d | 69 67 6e 6f 72 65 2d 62 |. --|ignore-b|
|00008cc0| 6c 61 6e 6b 2d 6c 69 6e | 65 73 20 20 2d 2d 69 67 |lank-lin|es --ig|
|00008cd0| 6e 6f 72 65 2d 63 61 73 | 65 0a 20 20 20 20 20 2d |nore-cas|e. -|
|00008ce0| 2d 69 67 6e 6f 72 65 2d | 6d 61 74 63 68 69 6e 67 |-ignore-|matching|
|00008cf0| 2d 6c 69 6e 65 73 3d 52 | 45 47 45 58 50 20 20 2d |-lines=R|EGEXP -|
|00008d00| 2d 69 67 6e 6f 72 65 2d | 73 70 61 63 65 2d 63 68 |-ignore-|space-ch|
|00008d10| 61 6e 67 65 0a 20 20 20 | 20 20 2d 2d 6c 65 66 74 |ange. | --left|
|00008d20| 2d 63 6f 6c 75 6d 6e 20 | 20 2d 2d 6d 69 6e 69 6d |-column | --minim|
|00008d30| 61 6c 20 20 2d 2d 73 70 | 65 65 64 2d 6c 61 72 67 |al --sp|eed-larg|
|00008d40| 65 2d 66 69 6c 65 73 0a | 20 20 20 20 20 2d 2d 73 |e-files.| --s|
|00008d50| 75 70 70 72 65 73 73 2d | 63 6f 6d 6d 6f 6e 2d 6c |uppress-|common-l|
|00008d60| 69 6e 65 73 20 20 2d 2d | 65 78 70 61 6e 64 2d 74 |ines --|expand-t|
|00008d70| 61 62 73 0a 20 20 20 20 | 20 2d 2d 74 65 78 74 20 |abs. | --text |
|00008d80| 20 2d 2d 76 65 72 73 69 | 6f 6e 20 20 2d 2d 77 69 | --versi|on --wi|
|00008d90| 64 74 68 3d 43 4f 4c 55 | 4d 4e 53 0a 0a 20 20 20 |dth=COLU|MNS.. |
|00008da0| 46 6f 72 20 68 69 73 74 | 6f 72 69 63 61 6c 20 72 |For hist|orical r|
|00008db0| 65 61 73 6f 6e 73 2c 20 | 60 73 64 69 66 66 27 20 |easons, |`sdiff' |
|00008dc0| 68 61 73 20 61 6c 74 65 | 72 6e 61 74 65 20 6e 61 |has alte|rnate na|
|00008dd0| 6d 65 73 20 66 6f 72 20 | 73 6f 6d 65 0a 6f 70 74 |mes for |some.opt|
|00008de0| 69 6f 6e 73 2e 20 20 54 | 68 65 20 60 2d 6c 27 20 |ions. T|he `-l' |
|00008df0| 6f 70 74 69 6f 6e 20 69 | 73 20 65 71 75 69 76 61 |option i|s equiva|
|00008e00| 6c 65 6e 74 20 74 6f 20 | 74 68 65 20 60 2d 2d 6c |lent to |the `--l|
|00008e10| 65 66 74 2d 63 6f 6c 75 | 6d 6e 27 20 6f 70 74 69 |eft-colu|mn' opti|
|00008e20| 6f 6e 2c 0a 61 6e 64 20 | 73 69 6d 69 6c 61 72 6c |on,.and |similarl|
|00008e30| 79 20 60 2d 73 27 20 69 | 73 20 65 71 75 69 76 61 |y `-s' i|s equiva|
|00008e40| 6c 65 6e 74 20 74 6f 20 | 60 2d 2d 73 75 70 70 72 |lent to |`--suppr|
|00008e50| 65 73 73 2d 63 6f 6d 6d | 6f 6e 2d 6c 69 6e 65 73 |ess-comm|on-lines|
|00008e60| 27 2e 20 20 54 68 65 0a | 6d 65 61 6e 69 6e 67 20 |'. The.|meaning |
|00008e70| 6f 66 20 74 68 65 20 60 | 73 64 69 66 66 27 20 60 |of the `|sdiff' `|
|00008e80| 2d 77 27 20 61 6e 64 20 | 60 2d 57 27 20 6f 70 74 |-w' and |`-W' opt|
|00008e90| 69 6f 6e 73 20 69 73 20 | 69 6e 74 65 72 63 68 61 |ions is |intercha|
|00008ea0| 6e 67 65 64 20 66 72 6f | 6d 20 74 68 61 74 0a 6f |nged fro|m that.o|
|00008eb0| 66 20 60 64 69 66 66 27 | 3a 20 77 69 74 68 20 60 |f `diff'|: with `|
|00008ec0| 73 64 69 66 66 27 2c 20 | 60 2d 77 20 43 4f 4c 55 |sdiff', |`-w COLU|
|00008ed0| 4d 4e 53 27 20 69 73 20 | 65 71 75 69 76 61 6c 65 |MNS' is |equivale|
|00008ee0| 6e 74 20 74 6f 0a 60 2d | 2d 77 69 64 74 68 3d 43 |nt to.`-|-width=C|
|00008ef0| 4f 4c 55 4d 4e 53 27 2c | 20 61 6e 64 20 60 2d 57 |OLUMNS',| and `-W|
|00008f00| 27 20 69 73 20 65 71 75 | 69 76 61 6c 65 6e 74 20 |' is equ|ivalent |
|00008f10| 74 6f 20 60 2d 2d 69 67 | 6e 6f 72 65 2d 61 6c 6c |to `--ig|nore-all|
|00008f20| 2d 73 70 61 63 65 27 2e | 0a 60 73 64 69 66 66 27 |-space'.|.`sdiff'|
|00008f30| 20 77 69 74 68 6f 75 74 | 20 74 68 65 20 60 2d 6f | without| the `-o|
|00008f40| 27 20 6f 70 74 69 6f 6e | 20 69 73 20 65 71 75 69 |' option| is equi|
|00008f50| 76 61 6c 65 6e 74 20 74 | 6f 20 60 64 69 66 66 27 |valent t|o `diff'|
|00008f60| 20 77 69 74 68 20 74 68 | 65 20 60 2d 79 27 0a 6f | with th|e `-y'.o|
|00008f70| 72 20 60 2d 2d 73 69 64 | 65 2d 62 79 2d 73 69 64 |r `--sid|e-by-sid|
|00008f80| 65 27 20 6f 70 74 69 6f | 6e 20 28 2a 6e 6f 74 65 |e' optio|n (*note|
|00008f90| 20 53 69 64 65 20 62 79 | 20 53 69 64 65 3a 3a 2e | Side by| Side::.|
|00008fa0| 29 2e 0a 0a 1f 0a 46 69 | 6c 65 3a 20 64 69 66 66 |).....Fi|le: diff|
|00008fb0| 2e 69 6e 66 6f 2c 20 20 | 4e 6f 64 65 3a 20 4d 65 |.info, |Node: Me|
|00008fc0| 72 67 65 20 43 6f 6d 6d | 61 6e 64 73 2c 20 20 50 |rge Comm|ands, P|
|00008fd0| 72 65 76 3a 20 73 64 69 | 66 66 20 4f 70 74 69 6f |rev: sdi|ff Optio|
|00008fe0| 6e 20 53 75 6d 6d 61 72 | 79 2c 20 20 55 70 3a 20 |n Summar|y, Up: |
|00008ff0| 49 6e 74 65 72 61 63 74 | 69 76 65 20 4d 65 72 67 |Interact|ive Merg|
|00009000| 69 6e 67 0a 0a 4d 65 72 | 67 65 20 43 6f 6d 6d 61 |ing..Mer|ge Comma|
|00009010| 6e 64 73 0a 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |nds.====|========|
|00009020| 3d 3d 0a 0a 20 20 20 47 | 72 6f 75 70 73 20 6f 66 |==.. G|roups of|
|00009030| 20 63 6f 6d 6d 6f 6e 20 | 6c 69 6e 65 73 2c 20 77 | common |lines, w|
|00009040| 69 74 68 20 61 20 62 6c | 61 6e 6b 20 67 75 74 74 |ith a bl|ank gutt|
|00009050| 65 72 2c 20 61 72 65 20 | 63 6f 70 69 65 64 20 66 |er, are |copied f|
|00009060| 72 6f 6d 20 74 68 65 0a | 66 69 72 73 74 20 66 69 |rom the.|first fi|
|00009070| 6c 65 20 74 6f 20 74 68 | 65 20 6f 75 74 70 75 74 |le to th|e output|
|00009080| 2e 20 20 41 66 74 65 72 | 20 65 61 63 68 20 67 72 |. After| each gr|
|00009090| 6f 75 70 20 6f 66 20 64 | 69 66 66 65 72 69 6e 67 |oup of d|iffering|
|000090a0| 20 6c 69 6e 65 73 2c 20 | 60 73 64 69 66 66 27 0a | lines, |`sdiff'.|
|000090b0| 70 72 6f 6d 70 74 73 20 | 77 69 74 68 20 60 25 27 |prompts |with `%'|
|000090c0| 20 61 6e 64 20 70 61 75 | 73 65 73 2c 20 77 61 69 | and pau|ses, wai|
|000090d0| 74 69 6e 67 20 66 6f 72 | 20 6f 6e 65 20 6f 66 20 |ting for| one of |
|000090e0| 74 68 65 20 66 6f 6c 6c | 6f 77 69 6e 67 20 63 6f |the foll|owing co|
|000090f0| 6d 6d 61 6e 64 73 2e 0a | 46 6f 6c 6c 6f 77 20 65 |mmands..|Follow e|
|00009100| 61 63 68 20 63 6f 6d 6d | 61 6e 64 20 77 69 74 68 |ach comm|and with|
|00009110| 20 52 45 54 2e 0a 0a 60 | 65 27 0a 20 20 20 20 20 | RET...`|e'. |
|00009120| 44 69 73 63 61 72 64 20 | 62 6f 74 68 20 76 65 72 |Discard |both ver|
|00009130| 73 69 6f 6e 73 2e 20 20 | 49 6e 76 6f 6b 65 20 61 |sions. |Invoke a|
|00009140| 20 74 65 78 74 20 65 64 | 69 74 6f 72 20 6f 6e 20 | text ed|itor on |
|00009150| 61 6e 20 65 6d 70 74 79 | 20 74 65 6d 70 6f 72 61 |an empty| tempora|
|00009160| 72 79 0a 20 20 20 20 20 | 66 69 6c 65 2c 20 74 68 |ry. |file, th|
|00009170| 65 6e 20 63 6f 70 79 20 | 74 68 65 20 72 65 73 75 |en copy |the resu|
|00009180| 6c 74 69 6e 67 20 66 69 | 6c 65 20 74 6f 20 74 68 |lting fi|le to th|
|00009190| 65 20 6f 75 74 70 75 74 | 2e 0a 0a 60 65 62 27 0a |e output|...`eb'.|
|000091a0| 20 20 20 20 20 43 6f 6e | 63 61 74 65 6e 61 74 65 | Con|catenate|
|000091b0| 20 74 68 65 20 74 77 6f | 20 76 65 72 73 69 6f 6e | the two| version|
|000091c0| 73 2c 20 65 64 69 74 20 | 74 68 65 20 72 65 73 75 |s, edit |the resu|
|000091d0| 6c 74 20 69 6e 20 61 20 | 74 65 6d 70 6f 72 61 72 |lt in a |temporar|
|000091e0| 79 20 66 69 6c 65 2c 0a | 20 20 20 20 20 74 68 65 |y file,.| the|
|000091f0| 6e 20 63 6f 70 79 20 74 | 68 65 20 65 64 69 74 65 |n copy t|he edite|
|00009200| 64 20 72 65 73 75 6c 74 | 20 74 6f 20 74 68 65 20 |d result| to the |
|00009210| 6f 75 74 70 75 74 2e 0a | 0a 60 65 6c 27 0a 20 20 |output..|.`el'. |
|00009220| 20 20 20 45 64 69 74 20 | 61 20 63 6f 70 79 20 6f | Edit |a copy o|
|00009230| 66 20 74 68 65 20 6c 65 | 66 74 20 76 65 72 73 69 |f the le|ft versi|
|00009240| 6f 6e 2c 20 74 68 65 6e | 20 63 6f 70 79 20 74 68 |on, then| copy th|
|00009250| 65 20 72 65 73 75 6c 74 | 20 74 6f 20 74 68 65 0a |e result| to the.|
|00009260| 20 20 20 20 20 6f 75 74 | 70 75 74 2e 0a 0a 60 65 | out|put...`e|
|00009270| 72 27 0a 20 20 20 20 20 | 45 64 69 74 20 61 20 63 |r'. |Edit a c|
|00009280| 6f 70 79 20 6f 66 20 74 | 68 65 20 72 69 67 68 74 |opy of t|he right|
|00009290| 20 76 65 72 73 69 6f 6e | 2c 20 74 68 65 6e 20 63 | version|, then c|
|000092a0| 6f 70 79 20 74 68 65 20 | 72 65 73 75 6c 74 20 74 |opy the |result t|
|000092b0| 6f 20 74 68 65 0a 20 20 | 20 20 20 6f 75 74 70 75 |o the. | outpu|
|000092c0| 74 2e 0a 0a 60 6c 27 0a | 20 20 20 20 20 43 6f 70 |t...`l'.| Cop|
|000092d0| 79 20 74 68 65 20 6c 65 | 66 74 20 76 65 72 73 69 |y the le|ft versi|
|000092e0| 6f 6e 20 74 6f 20 74 68 | 65 20 6f 75 74 70 75 74 |on to th|e output|
|000092f0| 2e 0a 0a 60 71 27 0a 20 | 20 20 20 20 51 75 69 74 |...`q'. | Quit|
|00009300| 2e 0a 0a 60 72 27 0a 20 | 20 20 20 20 43 6f 70 79 |...`r'. | Copy|
|00009310| 20 74 68 65 20 72 69 67 | 68 74 20 76 65 72 73 69 | the rig|ht versi|
|00009320| 6f 6e 20 74 6f 20 74 68 | 65 20 6f 75 74 70 75 74 |on to th|e output|
|00009330| 2e 0a 0a 60 73 27 0a 20 | 20 20 20 20 53 69 6c 65 |...`s'. | Sile|
|00009340| 6e 74 6c 79 20 63 6f 70 | 79 20 63 6f 6d 6d 6f 6e |ntly cop|y common|
|00009350| 20 6c 69 6e 65 73 2e 0a | 0a 60 76 27 0a 20 20 20 | lines..|.`v'. |
|00009360| 20 20 56 65 72 62 6f 73 | 65 6c 79 20 63 6f 70 79 | Verbos|ely copy|
|00009370| 20 63 6f 6d 6d 6f 6e 20 | 6c 69 6e 65 73 2e 20 20 | common |lines. |
|00009380| 54 68 69 73 20 69 73 20 | 74 68 65 20 64 65 66 61 |This is |the defa|
|00009390| 75 6c 74 2e 0a 0a 20 20 | 20 54 68 65 20 74 65 78 |ult... | The tex|
|000093a0| 74 20 65 64 69 74 6f 72 | 20 69 6e 76 6f 6b 65 64 |t editor| invoked|
|000093b0| 20 69 73 20 73 70 65 63 | 69 66 69 65 64 20 62 79 | is spec|ified by|
|000093c0| 20 74 68 65 20 60 45 44 | 49 54 4f 52 27 20 65 6e | the `ED|ITOR' en|
|000093d0| 76 69 72 6f 6e 6d 65 6e | 74 0a 76 61 72 69 61 62 |vironmen|t.variab|
|000093e0| 6c 65 20 69 66 20 69 74 | 20 69 73 20 73 65 74 2e |le if it| is set.|
|000093f0| 20 20 54 68 65 20 64 65 | 66 61 75 6c 74 20 69 73 | The de|fault is|
|00009400| 20 73 79 73 74 65 6d 2d | 64 65 70 65 6e 64 65 6e | system-|dependen|
|00009410| 74 2e 0a 0a 1f 0a 46 69 | 6c 65 3a 20 64 69 66 66 |t.....Fi|le: diff|
|00009420| 2e 69 6e 66 6f 2c 20 20 | 4e 6f 64 65 3a 20 4d 65 |.info, |Node: Me|
|00009430| 72 67 69 6e 67 20 77 69 | 74 68 20 70 61 74 63 68 |rging wi|th patch|
|00009440| 2c 20 20 4e 65 78 74 3a | 20 4d 61 6b 69 6e 67 20 |, Next:| Making |
|00009450| 50 61 74 63 68 65 73 2c | 20 20 50 72 65 76 3a 20 |Patches,| Prev: |
|00009460| 49 6e 74 65 72 61 63 74 | 69 76 65 20 4d 65 72 67 |Interact|ive Merg|
|00009470| 69 6e 67 2c 20 20 55 70 | 3a 20 54 6f 70 0a 0a 4d |ing, Up|: Top..M|
|00009480| 65 72 67 69 6e 67 20 77 | 69 74 68 20 60 70 61 74 |erging w|ith `pat|
|00009490| 63 68 27 0a 2a 2a 2a 2a | 2a 2a 2a 2a 2a 2a 2a 2a |ch'.****|********|
|000094a0| 2a 2a 2a 2a 2a 2a 2a 2a | 0a 0a 20 20 20 60 70 61 |********|.. `pa|
|000094b0| 74 63 68 27 20 74 61 6b | 65 73 20 63 6f 6d 70 61 |tch' tak|es compa|
|000094c0| 72 69 73 6f 6e 20 6f 75 | 74 70 75 74 20 70 72 6f |rison ou|tput pro|
|000094d0| 64 75 63 65 64 20 62 79 | 20 60 64 69 66 66 27 20 |duced by| `diff' |
|000094e0| 61 6e 64 20 61 70 70 6c | 69 65 73 20 74 68 65 0a |and appl|ies the.|
|000094f0| 64 69 66 66 65 72 65 6e | 63 65 73 20 74 6f 20 61 |differen|ces to a|
|00009500| 20 63 6f 70 79 20 6f 66 | 20 74 68 65 20 6f 72 69 | copy of| the ori|
|00009510| 67 69 6e 61 6c 20 66 69 | 6c 65 2c 20 70 72 6f 64 |ginal fi|le, prod|
|00009520| 75 63 69 6e 67 20 61 20 | 70 61 74 63 68 65 64 0a |ucing a |patched.|
|00009530| 76 65 72 73 69 6f 6e 2e | 20 20 57 69 74 68 20 60 |version.| With `|
|00009540| 70 61 74 63 68 27 2c 20 | 79 6f 75 20 63 61 6e 20 |patch', |you can |
|00009550| 64 69 73 74 72 69 62 75 | 74 65 20 6a 75 73 74 20 |distribu|te just |
|00009560| 74 68 65 20 63 68 61 6e | 67 65 73 20 74 6f 20 61 |the chan|ges to a|
|00009570| 20 73 65 74 20 6f 66 0a | 66 69 6c 65 73 20 69 6e | set of.|files in|
|00009580| 73 74 65 61 64 20 6f 66 | 20 64 69 73 74 72 69 62 |stead of| distrib|
|00009590| 75 74 69 6e 67 20 74 68 | 65 20 65 6e 74 69 72 65 |uting th|e entire|
|000095a0| 20 66 69 6c 65 20 73 65 | 74 3b 20 79 6f 75 72 20 | file se|t; your |
|000095b0| 63 6f 72 72 65 73 70 6f | 6e 64 65 6e 74 73 0a 63 |correspo|ndents.c|
|000095c0| 61 6e 20 61 70 70 6c 79 | 20 60 70 61 74 63 68 27 |an apply| `patch'|
|000095d0| 20 74 6f 20 75 70 64 61 | 74 65 20 74 68 65 69 72 | to upda|te their|
|000095e0| 20 63 6f 70 79 20 6f 66 | 20 74 68 65 20 66 69 6c | copy of| the fil|
|000095f0| 65 73 20 77 69 74 68 20 | 79 6f 75 72 20 63 68 61 |es with |your cha|
|00009600| 6e 67 65 73 2e 0a 60 70 | 61 74 63 68 27 20 61 75 |nges..`p|atch' au|
|00009610| 74 6f 6d 61 74 69 63 61 | 6c 6c 79 20 64 65 74 65 |tomatica|lly dete|
|00009620| 72 6d 69 6e 65 73 20 74 | 68 65 20 64 69 66 66 20 |rmines t|he diff |
|00009630| 66 6f 72 6d 61 74 2c 20 | 73 6b 69 70 73 20 61 6e |format, |skips an|
|00009640| 79 20 6c 65 61 64 69 6e | 67 20 6f 72 0a 74 72 61 |y leadin|g or.tra|
|00009650| 69 6c 69 6e 67 20 68 65 | 61 64 65 72 73 2c 20 61 |iling he|aders, a|
|00009660| 6e 64 20 75 73 65 73 20 | 74 68 65 20 68 65 61 64 |nd uses |the head|
|00009670| 65 72 73 20 74 6f 20 64 | 65 74 65 72 6d 69 6e 65 |ers to d|etermine|
|00009680| 20 77 68 69 63 68 20 66 | 69 6c 65 20 74 6f 0a 70 | which f|ile to.p|
|00009690| 61 74 63 68 2e 20 20 54 | 68 69 73 20 6c 65 74 73 |atch. T|his lets|
|000096a0| 20 79 6f 75 72 20 63 6f | 72 72 65 73 70 6f 6e 64 | your co|rrespond|
|000096b0| 65 6e 74 73 20 66 65 65 | 64 20 61 6e 20 61 72 74 |ents fee|d an art|
|000096c0| 69 63 6c 65 20 6f 72 20 | 6d 65 73 73 61 67 65 0a |icle or |message.|
|000096d0| 63 6f 6e 74 61 69 6e 69 | 6e 67 20 61 20 64 69 66 |containi|ng a dif|
|000096e0| 66 65 72 65 6e 63 65 20 | 6c 69 73 74 69 6e 67 20 |ference |listing |
|000096f0| 64 69 72 65 63 74 6c 79 | 20 74 6f 20 60 70 61 74 |directly| to `pat|
|00009700| 63 68 27 2e 0a 0a 20 20 | 20 60 70 61 74 63 68 27 |ch'... | `patch'|
|00009710| 20 64 65 74 65 63 74 73 | 20 61 6e 64 20 77 61 72 | detects| and war|
|00009720| 6e 73 20 61 62 6f 75 74 | 20 63 6f 6d 6d 6f 6e 20 |ns about| common |
|00009730| 70 72 6f 62 6c 65 6d 73 | 20 6c 69 6b 65 20 66 6f |problems| like fo|
|00009740| 72 77 61 72 64 0a 70 61 | 74 63 68 65 73 2e 20 20 |rward.pa|tches. |
|00009750| 49 74 20 73 61 76 65 73 | 20 74 68 65 20 6f 72 69 |It saves| the ori|
|00009760| 67 69 6e 61 6c 20 76 65 | 72 73 69 6f 6e 20 6f 66 |ginal ve|rsion of|
|00009770| 20 74 68 65 20 66 69 6c | 65 73 20 69 74 20 70 61 | the fil|es it pa|
|00009780| 74 63 68 65 73 2c 20 61 | 6e 64 0a 73 61 76 65 73 |tches, a|nd.saves|
|00009790| 20 61 6e 79 20 70 61 74 | 63 68 65 73 20 74 68 61 | any pat|ches tha|
|000097a0| 74 20 69 74 20 63 6f 75 | 6c 64 20 6e 6f 74 20 61 |t it cou|ld not a|
|000097b0| 70 70 6c 79 2e 20 20 49 | 74 20 63 61 6e 20 61 6c |pply. I|t can al|
|000097c0| 73 6f 20 6d 61 69 6e 74 | 61 69 6e 20 61 0a 60 70 |so maint|ain a.`p|
|000097d0| 61 74 63 68 6c 65 76 65 | 6c 2e 68 27 20 66 69 6c |atchleve|l.h' fil|
|000097e0| 65 20 74 6f 20 65 6e 73 | 75 72 65 73 20 74 68 61 |e to ens|ures tha|
|000097f0| 74 20 79 6f 75 72 20 63 | 6f 72 72 65 73 70 6f 6e |t your c|orrespon|
|00009800| 64 65 6e 74 73 20 61 70 | 70 6c 79 20 64 69 66 66 |dents ap|ply diff|
|00009810| 73 20 69 6e 0a 74 68 65 | 20 70 72 6f 70 65 72 20 |s in.the| proper |
|00009820| 6f 72 64 65 72 2e 0a 0a | 20 20 20 60 70 61 74 63 |order...| `patc|
|00009830| 68 27 20 61 63 63 65 70 | 74 73 20 61 20 73 65 72 |h' accep|ts a ser|
|00009840| 69 65 73 20 6f 66 20 64 | 69 66 66 73 20 69 6e 20 |ies of d|iffs in |
|00009850| 69 74 73 20 73 74 61 6e | 64 61 72 64 20 69 6e 70 |its stan|dard inp|
|00009860| 75 74 2c 20 75 73 75 61 | 6c 6c 79 0a 73 65 70 61 |ut, usua|lly.sepa|
|00009870| 72 61 74 65 64 20 62 79 | 20 68 65 61 64 65 72 73 |rated by| headers|
|00009880| 20 74 68 61 74 20 73 70 | 65 63 69 66 79 20 77 68 | that sp|ecify wh|
|00009890| 69 63 68 20 66 69 6c 65 | 20 74 6f 20 70 61 74 63 |ich file| to patc|
|000098a0| 68 2e 20 20 49 74 20 61 | 70 70 6c 69 65 73 0a 60 |h. It a|pplies.`|
|000098b0| 64 69 66 66 27 20 68 75 | 6e 6b 73 20 28 2a 6e 6f |diff' hu|nks (*no|
|000098c0| 74 65 20 48 75 6e 6b 73 | 3a 3a 2e 29 20 6f 6e 65 |te Hunks|::.) one|
|000098d0| 20 62 79 20 6f 6e 65 2e | 20 20 49 66 20 61 20 68 | by one.| If a h|
|000098e0| 75 6e 6b 20 64 6f 65 73 | 20 6e 6f 74 20 65 78 61 |unk does| not exa|
|000098f0| 63 74 6c 79 0a 6d 61 74 | 63 68 20 74 68 65 20 6f |ctly.mat|ch the o|
|00009900| 72 69 67 69 6e 61 6c 20 | 66 69 6c 65 2c 20 60 70 |riginal |file, `p|
|00009910| 61 74 63 68 27 20 75 73 | 65 73 20 68 65 75 72 69 |atch' us|es heuri|
|00009920| 73 74 69 63 73 20 74 6f | 20 74 72 79 20 74 6f 20 |stics to| try to |
|00009930| 70 61 74 63 68 20 74 68 | 65 0a 66 69 6c 65 20 61 |patch th|e.file a|
|00009940| 73 20 77 65 6c 6c 20 61 | 73 20 69 74 20 63 61 6e |s well a|s it can|
|00009950| 2e 20 20 49 66 20 6e 6f | 20 61 70 70 72 6f 78 69 |. If no| approxi|
|00009960| 6d 61 74 65 20 6d 61 74 | 63 68 20 63 61 6e 20 62 |mate mat|ch can b|
|00009970| 65 20 66 6f 75 6e 64 2c | 20 60 70 61 74 63 68 27 |e found,| `patch'|
|00009980| 0a 72 65 6a 65 63 74 73 | 20 74 68 65 20 68 75 6e |.rejects| the hun|
|00009990| 6b 20 61 6e 64 20 73 6b | 69 70 73 20 74 6f 20 74 |k and sk|ips to t|
|000099a0| 68 65 20 6e 65 78 74 20 | 68 75 6e 6b 2e 20 20 60 |he next |hunk. `|
|000099b0| 70 61 74 63 68 27 20 6e | 6f 72 6d 61 6c 6c 79 20 |patch' n|ormally |
|000099c0| 72 65 70 6c 61 63 65 73 | 0a 65 61 63 68 20 66 69 |replaces|.each fi|
|000099d0| 6c 65 20 46 20 77 69 74 | 68 20 69 74 73 20 6e 65 |le F wit|h its ne|
|000099e0| 77 20 76 65 72 73 69 6f | 6e 2c 20 73 61 76 69 6e |w versio|n, savin|
|000099f0| 67 20 74 68 65 20 6f 72 | 69 67 69 6e 61 6c 20 66 |g the or|iginal f|
|00009a00| 69 6c 65 20 69 6e 20 60 | 46 2e 6f 72 69 67 27 2c |ile in `|F.orig',|
|00009a10| 0a 61 6e 64 20 70 75 74 | 74 69 6e 67 20 72 65 6a |.and put|ting rej|
|00009a20| 65 63 74 20 68 75 6e 6b | 73 20 28 69 66 20 61 6e |ect hunk|s (if an|
|00009a30| 79 29 20 69 6e 74 6f 20 | 60 46 2e 72 65 6a 27 2e |y) into |`F.rej'.|
|00009a40| 0a 0a 20 20 20 2a 4e 6f | 74 65 20 49 6e 76 6f 6b |.. *No|te Invok|
|00009a50| 69 6e 67 20 70 61 74 63 | 68 3a 3a 2c 20 66 6f 72 |ing patc|h::, for|
|00009a60| 20 64 65 74 61 69 6c 65 | 64 20 69 6e 66 6f 72 6d | detaile|d inform|
|00009a70| 61 74 69 6f 6e 20 6f 6e | 20 74 68 65 20 6f 70 74 |ation on| the opt|
|00009a80| 69 6f 6e 73 20 74 6f 0a | 60 70 61 74 63 68 27 2e |ions to.|`patch'.|
|00009a90| 20 20 2a 4e 6f 74 65 20 | 42 61 63 6b 75 70 73 3a | *Note |Backups:|
|00009aa0| 3a 2c 20 66 6f 72 20 6d | 6f 72 65 20 69 6e 66 6f |:, for m|ore info|
|00009ab0| 72 6d 61 74 69 6f 6e 20 | 6f 6e 20 68 6f 77 20 60 |rmation |on how `|
|00009ac0| 70 61 74 63 68 27 20 6e | 61 6d 65 73 0a 62 61 63 |patch' n|ames.bac|
|00009ad0| 6b 75 70 20 66 69 6c 65 | 73 2e 20 20 2a 4e 6f 74 |kup file|s. *Not|
|00009ae0| 65 20 52 65 6a 65 63 74 | 73 3a 3a 2c 20 66 6f 72 |e Reject|s::, for|
|00009af0| 20 6d 6f 72 65 20 69 6e | 66 6f 72 6d 61 74 69 6f | more in|formatio|
|00009b00| 6e 20 6f 6e 20 77 68 65 | 72 65 20 60 70 61 74 63 |n on whe|re `patc|
|00009b10| 68 27 0a 70 75 74 73 20 | 72 65 6a 65 63 74 20 68 |h'.puts |reject h|
|00009b20| 75 6e 6b 73 2e 0a 0a 2a | 20 4d 65 6e 75 3a 0a 0a |unks...*| Menu:..|
|00009b30| 2a 20 70 61 74 63 68 20 | 49 6e 70 75 74 3a 3a 09 |* patch |Input::.|
|00009b40| 09 53 65 6c 65 63 74 69 | 6e 67 20 74 68 65 20 74 |.Selecti|ng the t|
|00009b50| 79 70 65 20 6f 66 20 60 | 70 61 74 63 68 27 20 69 |ype of `|patch' i|
|00009b60| 6e 70 75 74 2e 0a 2a 20 | 49 6d 70 65 72 66 65 63 |nput..* |Imperfec|
|00009b70| 74 3a 3a 09 09 44 65 61 | 6c 69 6e 67 20 77 69 74 |t::..Dea|ling wit|
|00009b80| 68 20 69 6d 70 65 72 66 | 65 63 74 20 70 61 74 63 |h imperf|ect patc|
|00009b90| 68 65 73 2e 0a 2a 20 45 | 6d 70 74 79 20 46 69 6c |hes..* E|mpty Fil|
|00009ba0| 65 73 3a 3a 09 09 52 65 | 6d 6f 76 69 6e 67 20 65 |es::..Re|moving e|
|00009bb0| 6d 70 74 79 20 66 69 6c | 65 73 20 61 66 74 65 72 |mpty fil|es after|
|00009bc0| 20 70 61 74 63 68 69 6e | 67 2e 0a 2a 20 4d 75 6c | patchin|g..* Mul|
|00009bd0| 74 69 70 6c 65 20 50 61 | 74 63 68 65 73 3a 3a 09 |tiple Pa|tches::.|
|00009be0| 48 61 6e 64 6c 69 6e 67 | 20 6d 75 6c 74 69 70 6c |Handling| multipl|
|00009bf0| 65 20 70 61 74 63 68 65 | 73 20 69 6e 20 61 20 66 |e patche|s in a f|
|00009c00| 69 6c 65 20 73 70 65 63 | 69 61 6c 6c 79 2e 0a 2a |ile spec|ially..*|
|00009c10| 20 70 61 74 63 68 20 4d | 65 73 73 61 67 65 73 3a | patch M|essages:|
|00009c20| 3a 09 4d 65 73 73 61 67 | 65 73 20 61 6e 64 20 71 |:.Messag|es and q|
|00009c30| 75 65 73 74 69 6f 6e 73 | 20 60 70 61 74 63 68 27 |uestions| `patch'|
|00009c40| 20 63 61 6e 20 70 72 6f | 64 75 63 65 2e 0a 0a 1f | can pro|duce....|
|00009c50| 0a 46 69 6c 65 3a 20 64 | 69 66 66 2e 69 6e 66 6f |.File: d|iff.info|
|00009c60| 2c 20 20 4e 6f 64 65 3a | 20 70 61 74 63 68 20 49 |, Node:| patch I|
|00009c70| 6e 70 75 74 2c 20 20 4e | 65 78 74 3a 20 49 6d 70 |nput, N|ext: Imp|
|00009c80| 65 72 66 65 63 74 2c 20 | 20 55 70 3a 20 4d 65 72 |erfect, | Up: Mer|
|00009c90| 67 69 6e 67 20 77 69 74 | 68 20 70 61 74 63 68 0a |ging wit|h patch.|
|00009ca0| 0a 53 65 6c 65 63 74 69 | 6e 67 20 74 68 65 20 60 |.Selecti|ng the `|
|00009cb0| 70 61 74 63 68 27 20 49 | 6e 70 75 74 20 46 6f 72 |patch' I|nput For|
|00009cc0| 6d 61 74 0a 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |mat.====|========|
|00009cd0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00009ce0| 3d 3d 3d 3d 3d 3d 0a 0a | 20 20 20 60 70 61 74 63 |======..| `patc|
|00009cf0| 68 27 20 6e 6f 72 6d 61 | 6c 6c 79 20 64 65 74 65 |h' norma|lly dete|
|00009d00| 72 6d 69 6e 65 73 20 77 | 68 69 63 68 20 60 64 69 |rmines w|hich `di|
|00009d10| 66 66 27 20 66 6f 72 6d | 61 74 20 74 68 65 20 70 |ff' form|at the p|
|00009d20| 61 74 63 68 20 66 69 6c | 65 20 75 73 65 73 0a 62 |atch fil|e uses.b|
|00009d30| 79 20 65 78 61 6d 69 6e | 69 6e 67 20 69 74 73 20 |y examin|ing its |
|00009d40| 63 6f 6e 74 65 6e 74 73 | 2e 20 20 46 6f 72 20 70 |contents|. For p|
|00009d50| 61 74 63 68 20 66 69 6c | 65 73 20 74 68 61 74 20 |atch fil|es that |
|00009d60| 63 6f 6e 74 61 69 6e 20 | 70 61 72 74 69 63 75 6c |contain |particul|
|00009d70| 61 72 6c 79 0a 63 6f 6e | 66 75 73 69 6e 67 20 6c |arly.con|fusing l|
|00009d80| 65 61 64 69 6e 67 20 74 | 65 78 74 2c 20 79 6f 75 |eading t|ext, you|
|00009d90| 20 6d 69 67 68 74 20 6e | 65 65 64 20 74 6f 20 75 | might n|eed to u|
|00009da0| 73 65 20 6f 6e 65 20 6f | 66 20 74 68 65 20 66 6f |se one o|f the fo|
|00009db0| 6c 6c 6f 77 69 6e 67 0a | 6f 70 74 69 6f 6e 73 20 |llowing.|options |
|00009dc0| 74 6f 20 66 6f 72 63 65 | 20 60 70 61 74 63 68 27 |to force| `patch'|
|00009dd0| 20 74 6f 20 69 6e 74 65 | 72 70 72 65 74 20 74 68 | to inte|rpret th|
|00009de0| 65 20 70 61 74 63 68 20 | 66 69 6c 65 20 61 73 20 |e patch |file as |
|00009df0| 61 20 63 65 72 74 61 69 | 6e 0a 66 6f 72 6d 61 74 |a certai|n.format|
|00009e00| 20 6f 66 20 64 69 66 66 | 2e 20 20 54 68 65 20 6f | of diff|. The o|
|00009e10| 75 74 70 75 74 20 66 6f | 72 6d 61 74 73 20 6c 69 |utput fo|rmats li|
|00009e20| 73 74 65 64 20 68 65 72 | 65 20 61 72 65 20 74 68 |sted her|e are th|
|00009e30| 65 20 6f 6e 6c 79 20 6f | 6e 65 73 20 74 68 61 74 |e only o|nes that|
|00009e40| 0a 60 70 61 74 63 68 27 | 20 63 61 6e 20 75 6e 64 |.`patch'| can und|
|00009e50| 65 72 73 74 61 6e 64 2e | 0a 0a 60 2d 63 27 0a 60 |erstand.|..`-c'.`|
|00009e60| 2d 2d 63 6f 6e 74 65 78 | 74 27 0a 20 20 20 20 20 |--contex|t'. |
|00009e70| 63 6f 6e 74 65 78 74 20 | 64 69 66 66 2e 0a 0a 60 |context |diff...`|
|00009e80| 2d 65 27 0a 60 2d 2d 65 | 64 27 0a 20 20 20 20 20 |-e'.`--e|d'. |
|00009e90| 60 65 64 27 20 73 63 72 | 69 70 74 2e 0a 0a 60 2d |`ed' scr|ipt...`-|
|00009ea0| 6e 27 0a 60 2d 2d 6e 6f | 72 6d 61 6c 27 0a 20 20 |n'.`--no|rmal'. |
|00009eb0| 20 20 20 6e 6f 72 6d 61 | 6c 20 64 69 66 66 2e 0a | norma|l diff..|
|00009ec0| 0a 60 2d 75 27 0a 60 2d | 2d 75 6e 69 66 69 65 64 |.`-u'.`-|-unified|
|00009ed0| 27 0a 20 20 20 20 20 75 | 6e 69 66 69 65 64 20 64 |'. u|nified d|
|00009ee0| 69 66 66 2e 0a 0a 1f 0a | 46 69 6c 65 3a 20 64 69 |iff.....|File: di|
|00009ef0| 66 66 2e 69 6e 66 6f 2c | 20 20 4e 6f 64 65 3a 20 |ff.info,| Node: |
|00009f00| 49 6d 70 65 72 66 65 63 | 74 2c 20 20 4e 65 78 74 |Imperfec|t, Next|
|00009f10| 3a 20 45 6d 70 74 79 20 | 46 69 6c 65 73 2c 20 20 |: Empty |Files, |
|00009f20| 50 72 65 76 3a 20 70 61 | 74 63 68 20 49 6e 70 75 |Prev: pa|tch Inpu|
|00009f30| 74 2c 20 20 55 70 3a 20 | 4d 65 72 67 69 6e 67 20 |t, Up: |Merging |
|00009f40| 77 69 74 68 20 70 61 74 | 63 68 0a 0a 41 70 70 6c |with pat|ch..Appl|
|00009f50| 79 69 6e 67 20 49 6d 70 | 65 72 66 65 63 74 20 50 |ying Imp|erfect P|
|00009f60| 61 74 63 68 65 73 0a 3d | 3d 3d 3d 3d 3d 3d 3d 3d |atches.=|========|
|00009f70| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00009f80| 3d 0a 0a 20 20 20 60 70 | 61 74 63 68 27 20 74 72 |=.. `p|atch' tr|
|00009f90| 69 65 73 20 74 6f 20 73 | 6b 69 70 20 61 6e 79 20 |ies to s|kip any |
|00009fa0| 6c 65 61 64 69 6e 67 20 | 74 65 78 74 20 69 6e 20 |leading |text in |
|00009fb0| 74 68 65 20 70 61 74 63 | 68 20 66 69 6c 65 2c 20 |the patc|h file, |
|00009fc0| 61 70 70 6c 79 20 74 68 | 65 0a 64 69 66 66 2c 20 |apply th|e.diff, |
|00009fd0| 61 6e 64 20 74 68 65 6e | 20 73 6b 69 70 20 61 6e |and then| skip an|
|00009fe0| 79 20 74 72 61 69 6c 69 | 6e 67 20 74 65 78 74 2e |y traili|ng text.|
|00009ff0| 20 20 54 68 75 73 20 79 | 6f 75 20 63 61 6e 20 66 | Thus y|ou can f|
|0000a000| 65 65 64 20 61 20 6e 65 | 77 73 20 61 72 74 69 63 |eed a ne|ws artic|
|0000a010| 6c 65 0a 6f 72 20 6d 61 | 69 6c 20 6d 65 73 73 61 |le.or ma|il messa|
|0000a020| 67 65 20 64 69 72 65 63 | 74 6c 79 20 74 6f 20 60 |ge direc|tly to `|
|0000a030| 70 61 74 63 68 27 2c 20 | 61 6e 64 20 69 74 20 73 |patch', |and it s|
|0000a040| 68 6f 75 6c 64 20 77 6f | 72 6b 2e 20 20 49 66 20 |hould wo|rk. If |
|0000a050| 74 68 65 20 65 6e 74 69 | 72 65 0a 64 69 66 66 20 |the enti|re.diff |
|0000a060| 69 73 20 69 6e 64 65 6e | 74 65 64 20 62 79 20 61 |is inden|ted by a|
|0000a070| 20 63 6f 6e 73 74 61 6e | 74 20 61 6d 6f 75 6e 74 | constan|t amount|
|0000a080| 20 6f 66 20 77 68 69 74 | 65 20 73 70 61 63 65 2c | of whit|e space,|
|0000a090| 20 60 70 61 74 63 68 27 | 0a 61 75 74 6f 6d 61 74 | `patch'|.automat|
|0000a0a0| 69 63 61 6c 6c 79 20 69 | 67 6e 6f 72 65 73 20 74 |ically i|gnores t|
|0000a0b0| 68 65 20 69 6e 64 65 6e | 74 61 74 69 6f 6e 2e 0a |he inden|tation..|
|0000a0c0| 0a 20 20 20 48 6f 77 65 | 76 65 72 2c 20 63 65 72 |. Howe|ver, cer|
|0000a0d0| 74 61 69 6e 20 6f 74 68 | 65 72 20 74 79 70 65 73 |tain oth|er types|
|0000a0e0| 20 6f 66 20 69 6d 70 65 | 72 66 65 63 74 20 69 6e | of impe|rfect in|
|0000a0f0| 70 75 74 20 72 65 71 75 | 69 72 65 20 75 73 65 72 |put requ|ire user|
|0000a100| 0a 69 6e 74 65 72 76 65 | 6e 74 69 6f 6e 2e 0a 0a |.interve|ntion...|
|0000a110| 2a 20 4d 65 6e 75 3a 0a | 0a 2a 20 43 68 61 6e 67 |* Menu:.|.* Chang|
|0000a120| 65 64 20 57 68 69 74 65 | 20 53 70 61 63 65 3a 3a |ed White| Space::|
|0000a130| 09 57 68 65 6e 20 74 61 | 62 73 20 61 6e 64 20 73 |.When ta|bs and s|
|0000a140| 70 61 63 65 73 20 64 6f | 6e 27 74 20 6d 61 74 63 |paces do|n't matc|
|0000a150| 68 20 65 78 61 63 74 6c | 79 2e 0a 2a 20 52 65 76 |h exactl|y..* Rev|
|0000a160| 65 72 73 65 64 20 50 61 | 74 63 68 65 73 3a 3a 09 |ersed Pa|tches::.|
|0000a170| 41 70 70 6c 79 69 6e 67 | 20 72 65 76 65 72 73 65 |Applying| reverse|
|0000a180| 64 20 70 61 74 63 68 65 | 73 20 63 6f 72 72 65 63 |d patche|s correc|
|0000a190| 74 6c 79 2e 0a 2a 20 49 | 6e 65 78 61 63 74 3a 3a |tly..* I|nexact::|
|0000a1a0| 09 09 48 65 6c 70 69 6e | 67 20 60 70 61 74 63 68 |..Helpin|g `patch|
|0000a1b0| 27 20 66 69 6e 64 20 63 | 6c 6f 73 65 20 6d 61 74 |' find c|lose mat|
|0000a1c0| 63 68 65 73 2e 0a 0a 1f | 0a 46 69 6c 65 3a 20 64 |ches....|.File: d|
|0000a1d0| 69 66 66 2e 69 6e 66 6f | 2c 20 20 4e 6f 64 65 3a |iff.info|, Node:|
|0000a1e0| 20 43 68 61 6e 67 65 64 | 20 57 68 69 74 65 20 53 | Changed| White S|
|0000a1f0| 70 61 63 65 2c 20 20 4e | 65 78 74 3a 20 52 65 76 |pace, N|ext: Rev|
|0000a200| 65 72 73 65 64 20 50 61 | 74 63 68 65 73 2c 20 20 |ersed Pa|tches, |
|0000a210| 55 70 3a 20 49 6d 70 65 | 72 66 65 63 74 0a 0a 41 |Up: Impe|rfect..A|
|0000a220| 70 70 6c 79 69 6e 67 20 | 50 61 74 63 68 65 73 20 |pplying |Patches |
|0000a230| 77 69 74 68 20 43 68 61 | 6e 67 65 64 20 57 68 69 |with Cha|nged Whi|
|0000a240| 74 65 20 53 70 61 63 65 | 0a 2d 2d 2d 2d 2d 2d 2d |te Space|.-------|
|0000a250| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|0000a260| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|0000a270| 2d 2d 0a 0a 20 20 20 53 | 6f 6d 65 74 69 6d 65 73 |--.. S|ometimes|
|0000a280| 20 6d 61 69 6c 65 72 73 | 2c 20 65 64 69 74 6f 72 | mailers|, editor|
|0000a290| 73 2c 20 6f 72 20 6f 74 | 68 65 72 20 70 72 6f 67 |s, or ot|her prog|
|0000a2a0| 72 61 6d 73 20 63 68 61 | 6e 67 65 20 73 70 61 63 |rams cha|nge spac|
|0000a2b0| 65 73 20 69 6e 74 6f 0a | 74 61 62 73 2c 20 6f 72 |es into.|tabs, or|
|0000a2c0| 20 76 69 63 65 20 76 65 | 72 73 61 2e 20 20 49 66 | vice ve|rsa. If|
|0000a2d0| 20 74 68 69 73 20 68 61 | 70 70 65 6e 73 20 74 6f | this ha|ppens to|
|0000a2e0| 20 61 20 70 61 74 63 68 | 20 66 69 6c 65 20 6f 72 | a patch| file or|
|0000a2f0| 20 61 6e 20 69 6e 70 75 | 74 20 66 69 6c 65 2c 0a | an inpu|t file,.|
|0000a300| 74 68 65 20 66 69 6c 65 | 73 20 6d 69 67 68 74 20 |the file|s might |
|0000a310| 6c 6f 6f 6b 20 74 68 65 | 20 73 61 6d 65 2c 20 62 |look the| same, b|
|0000a320| 75 74 20 60 70 61 74 63 | 68 27 20 77 69 6c 6c 20 |ut `patc|h' will |
|0000a330| 6e 6f 74 20 62 65 20 61 | 62 6c 65 20 74 6f 20 6d |not be a|ble to m|
|0000a340| 61 74 63 68 0a 74 68 65 | 6d 20 70 72 6f 70 65 72 |atch.the|m proper|
|0000a350| 6c 79 2e 20 20 49 66 20 | 74 68 69 73 20 70 72 6f |ly. If |this pro|
|0000a360| 62 6c 65 6d 20 6f 63 63 | 75 72 73 2c 20 75 73 65 |blem occ|urs, use|
|0000a370| 20 74 68 65 20 60 2d 6c | 27 20 6f 72 0a 60 2d 2d | the `-l|' or.`--|
|0000a380| 69 67 6e 6f 72 65 2d 77 | 68 69 74 65 2d 73 70 61 |ignore-w|hite-spa|
|0000a390| 63 65 27 20 6f 70 74 69 | 6f 6e 2c 20 77 68 69 63 |ce' opti|on, whic|
|0000a3a0| 68 20 6d 61 6b 65 73 20 | 60 70 61 74 63 68 27 20 |h makes |`patch' |
|0000a3b0| 63 6f 6d 70 61 72 65 20 | 77 68 69 74 65 20 73 70 |compare |white sp|
|0000a3c0| 61 63 65 0a 6c 6f 6f 73 | 65 6c 79 20 73 6f 20 74 |ace.loos|ely so t|
|0000a3d0| 68 61 74 20 61 6e 79 20 | 73 65 71 75 65 6e 63 65 |hat any |sequence|
|0000a3e0| 20 6f 66 20 77 68 69 74 | 65 20 73 70 61 63 65 20 | of whit|e space |
|0000a3f0| 69 6e 20 74 68 65 20 70 | 61 74 63 68 20 66 69 6c |in the p|atch fil|
|0000a400| 65 20 6d 61 74 63 68 65 | 73 0a 61 6e 79 20 73 65 |e matche|s.any se|
|0000a410| 71 75 65 6e 63 65 20 6f | 66 20 77 68 69 74 65 20 |quence o|f white |
|0000a420| 73 70 61 63 65 20 69 6e | 20 74 68 65 20 69 6e 70 |space in| the inp|
|0000a430| 75 74 20 66 69 6c 65 73 | 2e 20 20 4e 6f 6e 2d 77 |ut files|. Non-w|
|0000a440| 68 69 74 65 2d 73 70 61 | 63 65 0a 63 68 61 72 61 |hite-spa|ce.chara|
|0000a450| 63 74 65 72 73 20 6d 75 | 73 74 20 73 74 69 6c 6c |cters mu|st still|
|0000a460| 20 6d 61 74 63 68 20 65 | 78 61 63 74 6c 79 2e 20 | match e|xactly. |
|0000a470| 20 45 61 63 68 20 6c 69 | 6e 65 20 6f 66 20 74 68 | Each li|ne of th|
|0000a480| 65 20 63 6f 6e 74 65 78 | 74 20 6d 75 73 74 0a 73 |e contex|t must.s|
|0000a490| 74 69 6c 6c 20 6d 61 74 | 63 68 20 61 20 6c 69 6e |till mat|ch a lin|
|0000a4a0| 65 20 69 6e 20 74 68 65 | 20 69 6e 70 75 74 20 66 |e in the| input f|
|0000a4b0| 69 6c 65 2e 0a 0a 1f 0a | 46 69 6c 65 3a 20 64 69 |ile.....|File: di|
|0000a4c0| 66 66 2e 69 6e 66 6f 2c | 20 20 4e 6f 64 65 3a 20 |ff.info,| Node: |
|0000a4d0| 52 65 76 65 72 73 65 64 | 20 50 61 74 63 68 65 73 |Reversed| Patches|
|0000a4e0| 2c 20 20 4e 65 78 74 3a | 20 49 6e 65 78 61 63 74 |, Next:| Inexact|
|0000a4f0| 2c 20 20 50 72 65 76 3a | 20 43 68 61 6e 67 65 64 |, Prev:| Changed|
|0000a500| 20 57 68 69 74 65 20 53 | 70 61 63 65 2c 20 20 55 | White S|pace, U|
|0000a510| 70 3a 20 49 6d 70 65 72 | 66 65 63 74 0a 0a 41 70 |p: Imper|fect..Ap|
|0000a520| 70 6c 79 69 6e 67 20 52 | 65 76 65 72 73 65 64 20 |plying R|eversed |
|0000a530| 50 61 74 63 68 65 73 0a | 2d 2d 2d 2d 2d 2d 2d 2d |Patches.|--------|
|0000a540| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|0000a550| 2d 0a 0a 20 20 20 53 6f | 6d 65 74 69 6d 65 73 20 |-.. So|metimes |
|0000a560| 70 65 6f 70 6c 65 20 72 | 75 6e 20 60 64 69 66 66 |people r|un `diff|
|0000a570| 27 20 77 69 74 68 20 74 | 68 65 20 6e 65 77 20 66 |' with t|he new f|
|0000a580| 69 6c 65 20 66 69 72 73 | 74 20 69 6e 73 74 65 61 |ile firs|t instea|
|0000a590| 64 20 6f 66 0a 73 65 63 | 6f 6e 64 2e 20 20 54 68 |d of.sec|ond. Th|
|0000a5a0| 69 73 20 63 72 65 61 74 | 65 73 20 61 20 64 69 66 |is creat|es a dif|
|0000a5b0| 66 20 74 68 61 74 20 69 | 73 20 22 72 65 76 65 72 |f that i|s "rever|
|0000a5c0| 73 65 64 22 2e 20 20 54 | 6f 20 61 70 70 6c 79 20 |sed". T|o apply |
|0000a5d0| 73 75 63 68 0a 70 61 74 | 63 68 65 73 2c 20 67 69 |such.pat|ches, gi|
|0000a5e0| 76 65 20 60 70 61 74 63 | 68 27 20 74 68 65 20 60 |ve `patc|h' the `|
|0000a5f0| 2d 52 27 20 6f 72 20 60 | 2d 2d 72 65 76 65 72 73 |-R' or `|--revers|
|0000a600| 65 27 20 6f 70 74 69 6f | 6e 2e 20 20 60 70 61 74 |e' optio|n. `pat|
|0000a610| 63 68 27 20 74 68 65 6e | 0a 61 74 74 65 6d 70 74 |ch' then|.attempt|
|0000a620| 73 20 74 6f 20 73 77 61 | 70 20 65 61 63 68 20 68 |s to swa|p each h|
|0000a630| 75 6e 6b 20 61 72 6f 75 | 6e 64 20 62 65 66 6f 72 |unk arou|nd befor|
|0000a640| 65 20 61 70 70 6c 79 69 | 6e 67 20 69 74 2e 20 20 |e applyi|ng it. |
|0000a650| 52 65 6a 65 63 74 73 20 | 63 6f 6d 65 20 6f 75 74 |Rejects |come out|
|0000a660| 0a 69 6e 20 74 68 65 20 | 73 77 61 70 70 65 64 20 |.in the |swapped |
|0000a670| 66 6f 72 6d 61 74 2e 20 | 20 54 68 65 20 60 2d 52 |format. | The `-R|
|0000a680| 27 20 6f 70 74 69 6f 6e | 20 64 6f 65 73 20 6e 6f |' option| does no|
|0000a690| 74 20 77 6f 72 6b 20 77 | 69 74 68 20 60 65 64 27 |t work w|ith `ed'|
|0000a6a0| 20 73 63 72 69 70 74 73 | 0a 62 65 63 61 75 73 65 | scripts|.because|
|0000a6b0| 20 74 68 65 72 65 20 69 | 73 20 74 6f 6f 20 6c 69 | there i|s too li|
|0000a6c0| 74 74 6c 65 20 69 6e 66 | 6f 72 6d 61 74 69 6f 6e |ttle inf|ormation|
|0000a6d0| 20 69 6e 20 74 68 65 6d | 20 74 6f 20 72 65 63 6f | in them| to reco|
|0000a6e0| 6e 73 74 72 75 63 74 20 | 74 68 65 0a 72 65 76 65 |nstruct |the.reve|
|0000a6f0| 72 73 65 20 6f 70 65 72 | 61 74 69 6f 6e 2e 0a 0a |rse oper|ation...|
|0000a700| 20 20 20 4f 66 74 65 6e | 20 60 70 61 74 63 68 27 | Often| `patch'|
|0000a710| 20 63 61 6e 20 67 75 65 | 73 73 20 74 68 61 74 20 | can gue|ss that |
|0000a720| 74 68 65 20 70 61 74 63 | 68 20 69 73 20 72 65 76 |the patc|h is rev|
|0000a730| 65 72 73 65 64 2e 20 20 | 49 66 20 74 68 65 20 66 |ersed. |If the f|
|0000a740| 69 72 73 74 0a 68 75 6e | 6b 20 6f 66 20 61 20 70 |irst.hun|k of a p|
|0000a750| 61 74 63 68 20 66 61 69 | 6c 73 2c 20 60 70 61 74 |atch fai|ls, `pat|
|0000a760| 63 68 27 20 72 65 76 65 | 72 73 65 73 20 74 68 65 |ch' reve|rses the|
|0000a770| 20 68 75 6e 6b 20 74 6f | 20 73 65 65 20 69 66 20 | hunk to| see if |
|0000a780| 69 74 20 63 61 6e 20 61 | 70 70 6c 79 0a 69 74 20 |it can a|pply.it |
|0000a790| 74 68 61 74 20 77 61 79 | 2e 20 20 49 66 20 69 74 |that way|. If it|
|0000a7a0| 20 63 61 6e 2c 20 60 70 | 61 74 63 68 27 20 61 73 | can, `p|atch' as|
|0000a7b0| 6b 73 20 79 6f 75 20 69 | 66 20 79 6f 75 20 77 61 |ks you i|f you wa|
|0000a7c0| 6e 74 20 74 6f 20 68 61 | 76 65 20 74 68 65 20 60 |nt to ha|ve the `|
|0000a7d0| 2d 52 27 0a 6f 70 74 69 | 6f 6e 20 73 65 74 3b 20 |-R'.opti|on set; |
|0000a7e0| 69 66 20 69 74 20 63 61 | 6e 27 74 2c 20 60 70 61 |if it ca|n't, `pa|
|0000a7f0| 74 63 68 27 20 63 6f 6e | 74 69 6e 75 65 73 20 74 |tch' con|tinues t|
|0000a800| 6f 20 61 70 70 6c 79 20 | 74 68 65 20 70 61 74 63 |o apply |the patc|
|0000a810| 68 20 6e 6f 72 6d 61 6c | 6c 79 2e 0a 54 68 69 73 |h normal|ly..This|
|0000a820| 20 6d 65 74 68 6f 64 20 | 63 61 6e 6e 6f 74 20 64 | method |cannot d|
|0000a830| 65 74 65 63 74 20 61 20 | 72 65 76 65 72 73 65 64 |etect a |reversed|
|0000a840| 20 70 61 74 63 68 20 69 | 66 20 69 74 20 69 73 20 | patch i|f it is |
|0000a850| 61 20 6e 6f 72 6d 61 6c | 20 64 69 66 66 20 61 6e |a normal| diff an|
|0000a860| 64 0a 74 68 65 20 66 69 | 72 73 74 20 63 6f 6d 6d |d.the fi|rst comm|
|0000a870| 61 6e 64 20 69 73 20 61 | 6e 20 61 70 70 65 6e 64 |and is a|n append|
|0000a880| 20 28 77 68 69 63 68 20 | 73 68 6f 75 6c 64 20 68 | (which |should h|
|0000a890| 61 76 65 20 62 65 65 6e | 20 61 20 64 65 6c 65 74 |ave been| a delet|
|0000a8a0| 65 29 20 73 69 6e 63 65 | 0a 61 70 70 65 6e 64 73 |e) since|.appends|
|0000a8b0| 20 61 6c 77 61 79 73 20 | 73 75 63 63 65 65 64 2c | always |succeed,|
|0000a8c0| 20 62 65 63 61 75 73 65 | 20 61 20 6e 75 6c 6c 20 | because| a null |
|0000a8d0| 63 6f 6e 74 65 78 74 20 | 6d 61 74 63 68 65 73 20 |context |matches |
|0000a8e0| 61 6e 79 77 68 65 72 65 | 2e 20 20 42 75 74 0a 6d |anywhere|. But.m|
|0000a8f0| 6f 73 74 20 70 61 74 63 | 68 65 73 20 61 64 64 20 |ost patc|hes add |
|0000a900| 6f 72 20 63 68 61 6e 67 | 65 20 6c 69 6e 65 73 20 |or chang|e lines |
|0000a910| 72 61 74 68 65 72 20 74 | 68 61 6e 20 64 65 6c 65 |rather t|han dele|
|0000a920| 74 65 20 74 68 65 6d 2c | 20 73 6f 20 6d 6f 73 74 |te them,| so most|
|0000a930| 0a 72 65 76 65 72 73 65 | 64 20 6e 6f 72 6d 61 6c |.reverse|d normal|
|0000a940| 20 64 69 66 66 73 20 62 | 65 67 69 6e 20 77 69 74 | diffs b|egin wit|
|0000a950| 68 20 61 20 64 65 6c 65 | 74 65 2c 20 77 68 69 63 |h a dele|te, whic|
|0000a960| 68 20 66 61 69 6c 73 2c | 20 61 6e 64 20 60 70 61 |h fails,| and `pa|
|0000a970| 74 63 68 27 0a 6e 6f 74 | 69 63 65 73 2e 0a 0a 20 |tch'.not|ices... |
|0000a980| 20 20 49 66 20 79 6f 75 | 20 61 70 70 6c 79 20 61 | If you| apply a|
|0000a990| 20 70 61 74 63 68 20 74 | 68 61 74 20 79 6f 75 20 | patch t|hat you |
|0000a9a0| 68 61 76 65 20 61 6c 72 | 65 61 64 79 20 61 70 70 |have alr|eady app|
|0000a9b0| 6c 69 65 64 2c 20 60 70 | 61 74 63 68 27 20 74 68 |lied, `p|atch' th|
|0000a9c0| 69 6e 6b 73 0a 69 74 20 | 69 73 20 61 20 72 65 76 |inks.it |is a rev|
|0000a9d0| 65 72 73 65 64 20 70 61 | 74 63 68 20 61 6e 64 20 |ersed pa|tch and |
|0000a9e0| 6f 66 66 65 72 73 20 74 | 6f 20 75 6e 2d 61 70 70 |offers t|o un-app|
|0000a9f0| 6c 79 20 74 68 65 20 70 | 61 74 63 68 2e 20 20 54 |ly the p|atch. T|
|0000aa00| 68 69 73 20 63 6f 75 6c | 64 20 62 65 0a 63 6f 6e |his coul|d be.con|
|0000aa10| 73 74 72 75 65 64 20 61 | 73 20 61 20 66 65 61 74 |strued a|s a feat|
|0000aa20| 75 72 65 2e 20 20 49 66 | 20 79 6f 75 20 64 69 64 |ure. If| you did|
|0000aa30| 20 74 68 69 73 20 69 6e | 61 64 76 65 72 74 65 6e | this in|adverten|
|0000aa40| 74 6c 79 20 61 6e 64 20 | 79 6f 75 20 64 6f 6e 27 |tly and |you don'|
|0000aa50| 74 0a 77 61 6e 74 20 74 | 6f 20 75 6e 2d 61 70 70 |t.want t|o un-app|
|0000aa60| 6c 79 20 74 68 65 20 70 | 61 74 63 68 2c 20 6a 75 |ly the p|atch, ju|
|0000aa70| 73 74 20 61 6e 73 77 65 | 72 20 60 6e 27 20 74 6f |st answe|r `n' to|
|0000aa80| 20 74 68 69 73 20 6f 66 | 66 65 72 20 61 6e 64 20 | this of|fer and |
|0000aa90| 74 6f 20 74 68 65 0a 73 | 75 62 73 65 71 75 65 6e |to the.s|ubsequen|
|0000aaa0| 74 20 22 61 70 70 6c 79 | 20 61 6e 79 77 61 79 22 |t "apply| anyway"|
|0000aab0| 20 71 75 65 73 74 69 6f | 6e 2d 2d 6f 72 20 74 79 | questio|n--or ty|
|0000aac0| 70 65 20 60 43 2d 63 27 | 20 74 6f 20 6b 69 6c 6c |pe `C-c'| to kill|
|0000aad0| 20 74 68 65 20 60 70 61 | 74 63 68 27 0a 70 72 6f | the `pa|tch'.pro|
|0000aae0| 63 65 73 73 2e 0a 0a 1f | 0a 46 69 6c 65 3a 20 64 |cess....|.File: d|
|0000aaf0| 69 66 66 2e 69 6e 66 6f | 2c 20 20 4e 6f 64 65 3a |iff.info|, Node:|
|0000ab00| 20 49 6e 65 78 61 63 74 | 2c 20 20 50 72 65 76 3a | Inexact|, Prev:|
|0000ab10| 20 52 65 76 65 72 73 65 | 64 20 50 61 74 63 68 65 | Reverse|d Patche|
|0000ab20| 73 2c 20 20 55 70 3a 20 | 49 6d 70 65 72 66 65 63 |s, Up: |Imperfec|
|0000ab30| 74 0a 0a 48 65 6c 70 69 | 6e 67 20 60 70 61 74 63 |t..Helpi|ng `patc|
|0000ab40| 68 27 20 46 69 6e 64 20 | 49 6e 65 78 61 63 74 20 |h' Find |Inexact |
|0000ab50| 4d 61 74 63 68 65 73 0a | 2d 2d 2d 2d 2d 2d 2d 2d |Matches.|--------|
|0000ab60| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|0000ab70| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 0a 0a 20 20 |--------|----.. |
|0000ab80| 20 46 6f 72 20 63 6f 6e | 74 65 78 74 20 64 69 66 | For con|text dif|
|0000ab90| 66 73 2c 20 61 6e 64 20 | 74 6f 20 61 20 6c 65 73 |fs, and |to a les|
|0000aba0| 73 65 72 20 65 78 74 65 | 6e 74 20 6e 6f 72 6d 61 |ser exte|nt norma|
|0000abb0| 6c 20 64 69 66 66 73 2c | 20 60 70 61 74 63 68 27 |l diffs,| `patch'|
|0000abc0| 20 63 61 6e 0a 64 65 74 | 65 63 74 20 77 68 65 6e | can.det|ect when|
|0000abd0| 20 74 68 65 20 6c 69 6e | 65 20 6e 75 6d 62 65 72 | the lin|e number|
|0000abe0| 73 20 6d 65 6e 74 69 6f | 6e 65 64 20 69 6e 20 74 |s mentio|ned in t|
|0000abf0| 68 65 20 70 61 74 63 68 | 20 61 72 65 20 69 6e 63 |he patch| are inc|
|0000ac00| 6f 72 72 65 63 74 2c 20 | 61 6e 64 0a 69 74 20 61 |orrect, |and.it a|
|0000ac10| 74 74 65 6d 70 74 73 20 | 74 6f 20 66 69 6e 64 20 |ttempts |to find |
|0000ac20| 74 68 65 20 63 6f 72 72 | 65 63 74 20 70 6c 61 63 |the corr|ect plac|
|0000ac30| 65 20 74 6f 20 61 70 70 | 6c 79 20 65 61 63 68 20 |e to app|ly each |
|0000ac40| 68 75 6e 6b 20 6f 66 20 | 74 68 65 20 70 61 74 63 |hunk of |the patc|
|0000ac50| 68 2e 0a 41 73 20 61 20 | 66 69 72 73 74 20 67 75 |h..As a |first gu|
|0000ac60| 65 73 73 2c 20 69 74 20 | 74 61 6b 65 73 20 74 68 |ess, it |takes th|
|0000ac70| 65 20 6c 69 6e 65 20 6e | 75 6d 62 65 72 20 6d 65 |e line n|umber me|
|0000ac80| 6e 74 69 6f 6e 65 64 20 | 69 6e 20 74 68 65 20 68 |ntioned |in the h|
|0000ac90| 75 6e 6b 2c 20 70 6c 75 | 73 0a 6f 72 20 6d 69 6e |unk, plu|s.or min|
|0000aca0| 75 73 20 61 6e 79 20 6f | 66 66 73 65 74 20 75 73 |us any o|ffset us|
|0000acb0| 65 64 20 69 6e 20 61 70 | 70 6c 79 69 6e 67 20 74 |ed in ap|plying t|
|0000acc0| 68 65 20 70 72 65 76 69 | 6f 75 73 20 68 75 6e 6b |he previ|ous hunk|
|0000acd0| 2e 20 20 49 66 20 74 68 | 61 74 20 69 73 20 6e 6f |. If th|at is no|
|0000ace0| 74 0a 74 68 65 20 63 6f | 72 72 65 63 74 20 70 6c |t.the co|rrect pl|
|0000acf0| 61 63 65 2c 20 60 70 61 | 74 63 68 27 20 73 63 61 |ace, `pa|tch' sca|
|0000ad00| 6e 73 20 62 6f 74 68 20 | 66 6f 72 77 61 72 64 20 |ns both |forward |
|0000ad10| 61 6e 64 20 62 61 63 6b | 77 61 72 64 20 66 6f 72 |and back|ward for|
|0000ad20| 20 61 20 73 65 74 20 6f | 66 0a 6c 69 6e 65 73 20 | a set o|f.lines |
|0000ad30| 6d 61 74 63 68 69 6e 67 | 20 74 68 65 20 63 6f 6e |matching| the con|
|0000ad40| 74 65 78 74 20 67 69 76 | 65 6e 20 69 6e 20 74 68 |text giv|en in th|
|0000ad50| 65 20 68 75 6e 6b 2e 0a | 0a 20 20 20 46 69 72 73 |e hunk..|. Firs|
|0000ad60| 74 20 60 70 61 74 63 68 | 27 20 6c 6f 6f 6b 73 20 |t `patch|' looks |
|0000ad70| 66 6f 72 20 61 20 70 6c | 61 63 65 20 77 68 65 72 |for a pl|ace wher|
|0000ad80| 65 20 61 6c 6c 20 6c 69 | 6e 65 73 20 6f 66 20 74 |e all li|nes of t|
|0000ad90| 68 65 20 63 6f 6e 74 65 | 78 74 0a 6d 61 74 63 68 |he conte|xt.match|
|0000ada0| 2e 20 20 49 66 20 69 74 | 20 63 61 6e 6e 6f 74 20 |. If it| cannot |
|0000adb0| 66 69 6e 64 20 73 75 63 | 68 20 61 20 70 6c 61 63 |find suc|h a plac|
|0000adc0| 65 2c 20 61 6e 64 20 69 | 74 20 69 73 20 72 65 61 |e, and i|t is rea|
|0000add0| 64 69 6e 67 20 61 20 63 | 6f 6e 74 65 78 74 20 6f |ding a c|ontext o|
|0000ade0| 72 0a 75 6e 69 66 69 65 | 64 20 64 69 66 66 2c 20 |r.unifie|d diff, |
|0000adf0| 61 6e 64 20 74 68 65 20 | 6d 61 78 69 6d 75 6d 20 |and the |maximum |
|0000ae00| 66 75 7a 7a 20 66 61 63 | 74 6f 72 20 69 73 20 73 |fuzz fac|tor is s|
|0000ae10| 65 74 20 74 6f 20 31 20 | 6f 72 20 6d 6f 72 65 2c |et to 1 |or more,|
|0000ae20| 20 74 68 65 6e 0a 60 70 | 61 74 63 68 27 20 6d 61 | then.`p|atch' ma|
|0000ae30| 6b 65 73 20 61 6e 6f 74 | 68 65 72 20 73 63 61 6e |kes anot|her scan|
|0000ae40| 2c 20 69 67 6e 6f 72 69 | 6e 67 20 74 68 65 20 66 |, ignori|ng the f|
|0000ae50| 69 72 73 74 20 61 6e 64 | 20 6c 61 73 74 20 6c 69 |irst and| last li|
|0000ae60| 6e 65 20 6f 66 0a 63 6f | 6e 74 65 78 74 2e 20 20 |ne of.co|ntext. |
|0000ae70| 49 66 20 74 68 61 74 20 | 66 61 69 6c 73 2c 20 61 |If that |fails, a|
|0000ae80| 6e 64 20 74 68 65 20 6d | 61 78 69 6d 75 6d 20 66 |nd the m|aximum f|
|0000ae90| 75 7a 7a 20 66 61 63 74 | 6f 72 20 69 73 20 73 65 |uzz fact|or is se|
|0000aea0| 74 20 74 6f 20 32 20 6f | 72 0a 6d 6f 72 65 2c 20 |t to 2 o|r.more, |
|0000aeb0| 69 74 20 6d 61 6b 65 73 | 20 61 6e 6f 74 68 65 72 |it makes| another|
|0000aec0| 20 73 63 61 6e 2c 20 69 | 67 6e 6f 72 69 6e 67 20 | scan, i|gnoring |
|0000aed0| 74 68 65 20 66 69 72 73 | 74 20 74 77 6f 20 61 6e |the firs|t two an|
|0000aee0| 64 20 6c 61 73 74 20 74 | 77 6f 20 6c 69 6e 65 73 |d last t|wo lines|
|0000aef0| 0a 6f 66 20 63 6f 6e 74 | 65 78 74 20 61 72 65 20 |.of cont|ext are |
|0000af00| 69 67 6e 6f 72 65 64 2e | 20 20 49 74 20 63 6f 6e |ignored.| It con|
|0000af10| 74 69 6e 75 65 73 20 73 | 69 6d 69 6c 61 72 6c 79 |tinues s|imilarly|
|0000af20| 20 69 66 20 74 68 65 20 | 6d 61 78 69 6d 75 6d 20 | if the |maximum |
|0000af30| 66 75 7a 7a 0a 66 61 63 | 74 6f 72 20 69 73 20 6c |fuzz.fac|tor is l|
|0000af40| 61 72 67 65 72 2e 0a 0a | 20 20 20 54 68 65 20 60 |arger...| The `|
|0000af50| 2d 46 20 4c 49 4e 45 53 | 27 20 6f 72 20 60 2d 2d |-F LINES|' or `--|
|0000af60| 66 75 7a 7a 3d 4c 49 4e | 45 53 27 20 6f 70 74 69 |fuzz=LIN|ES' opti|
|0000af70| 6f 6e 20 73 65 74 73 20 | 74 68 65 20 6d 61 78 69 |on sets |the maxi|
|0000af80| 6d 75 6d 20 66 75 7a 7a | 20 66 61 63 74 6f 72 0a |mum fuzz| factor.|
|0000af90| 74 6f 20 4c 49 4e 45 53 | 2e 20 20 54 68 69 73 20 |to LINES|. This |
|0000afa0| 6f 70 74 69 6f 6e 20 6f | 6e 6c 79 20 61 70 70 6c |option o|nly appl|
|0000afb0| 69 65 73 20 74 6f 20 63 | 6f 6e 74 65 78 74 20 61 |ies to c|ontext a|
|0000afc0| 6e 64 20 75 6e 69 66 69 | 65 64 20 64 69 66 66 73 |nd unifi|ed diffs|
|0000afd0| 3b 20 69 74 0a 69 67 6e | 6f 72 65 73 20 75 70 20 |; it.ign|ores up |
|0000afe0| 74 6f 20 4c 49 4e 45 53 | 20 6c 69 6e 65 73 20 77 |to LINES| lines w|
|0000aff0| 68 69 6c 65 20 6c 6f 6f | 6b 69 6e 67 20 66 6f 72 |hile loo|king for|
|0000b000| 20 74 68 65 20 70 6c 61 | 63 65 20 74 6f 20 69 6e | the pla|ce to in|
|0000b010| 73 74 61 6c 6c 20 61 0a | 68 75 6e 6b 2e 20 20 4e |stall a.|hunk. N|
|0000b020| 6f 74 65 20 74 68 61 74 | 20 61 20 6c 61 72 67 65 |ote that| a large|
|0000b030| 72 20 66 75 7a 7a 20 66 | 61 63 74 6f 72 20 69 6e |r fuzz f|actor in|
|0000b040| 63 72 65 61 73 65 73 20 | 74 68 65 20 6f 64 64 73 |creases |the odds|
|0000b050| 20 6f 66 20 6d 61 6b 69 | 6e 67 20 61 0a 66 61 75 | of maki|ng a.fau|
|0000b060| 6c 74 79 20 70 61 74 63 | 68 2e 20 20 54 68 65 20 |lty patc|h. The |
|0000b070| 64 65 66 61 75 6c 74 20 | 66 75 7a 7a 20 66 61 63 |default |fuzz fac|
|0000b080| 74 6f 72 20 69 73 20 32 | 3b 20 69 74 20 6d 61 79 |tor is 2|; it may|
|0000b090| 20 6e 6f 74 20 62 65 20 | 73 65 74 20 74 6f 20 6d | not be |set to m|
|0000b0a0| 6f 72 65 0a 74 68 61 6e | 20 74 68 65 20 6e 75 6d |ore.than| the num|
|0000b0b0| 62 65 72 20 6f 66 20 6c | 69 6e 65 73 20 6f 66 20 |ber of l|ines of |
|0000b0c0| 63 6f 6e 74 65 78 74 20 | 69 6e 20 74 68 65 20 64 |context |in the d|
|0000b0d0| 69 66 66 2c 20 6f 72 64 | 69 6e 61 72 69 6c 79 20 |iff, ord|inarily |
|0000b0e0| 33 2e 0a 0a 20 20 20 49 | 66 20 60 70 61 74 63 68 |3... I|f `patch|
|0000b0f0| 27 20 63 61 6e 6e 6f 74 | 20 66 69 6e 64 20 61 20 |' cannot| find a |
|0000b100| 70 6c 61 63 65 20 74 6f | 20 69 6e 73 74 61 6c 6c |place to| install|
|0000b110| 20 61 20 68 75 6e 6b 20 | 6f 66 20 74 68 65 20 70 | a hunk |of the p|
|0000b120| 61 74 63 68 2c 20 69 74 | 0a 77 72 69 74 65 73 20 |atch, it|.writes |
|0000b130| 74 68 65 20 68 75 6e 6b | 20 6f 75 74 20 74 6f 20 |the hunk| out to |
|0000b140| 61 20 72 65 6a 65 63 74 | 20 66 69 6c 65 20 28 2a |a reject| file (*|
|0000b150| 6e 6f 74 65 20 52 65 6a | 65 63 74 73 3a 3a 2e 2c |note Rej|ects::.,|
|0000b160| 20 66 6f 72 20 69 6e 66 | 6f 72 6d 61 74 69 6f 6e | for inf|ormation|
|0000b170| 0a 6f 6e 20 68 6f 77 20 | 72 65 6a 65 63 74 20 66 |.on how |reject f|
|0000b180| 69 6c 65 73 20 61 72 65 | 20 6e 61 6d 65 64 29 2e |iles are| named).|
|0000b190| 20 20 49 74 20 77 72 69 | 74 65 73 20 6f 75 74 20 | It wri|tes out |
|0000b1a0| 72 65 6a 65 63 74 65 64 | 20 68 75 6e 6b 73 20 69 |rejected| hunks i|
|0000b1b0| 6e 20 63 6f 6e 74 65 78 | 74 0a 66 6f 72 6d 61 74 |n contex|t.format|
|0000b1c0| 20 6e 6f 20 6d 61 74 74 | 65 72 20 77 68 61 74 20 | no matt|er what |
|0000b1d0| 66 6f 72 6d 20 74 68 65 | 20 69 6e 70 75 74 20 70 |form the| input p|
|0000b1e0| 61 74 63 68 20 69 73 20 | 69 6e 2e 20 20 49 66 20 |atch is |in. If |
|0000b1f0| 74 68 65 20 69 6e 70 75 | 74 20 69 73 20 61 0a 6e |the inpu|t is a.n|
|0000b200| 6f 72 6d 61 6c 20 6f 72 | 20 60 65 64 27 20 64 69 |ormal or| `ed' di|
|0000b210| 66 66 2c 20 6d 61 6e 79 | 20 6f 66 20 74 68 65 20 |ff, many| of the |
|0000b220| 63 6f 6e 74 65 78 74 73 | 20 61 72 65 20 73 69 6d |contexts| are sim|
|0000b230| 70 6c 79 20 6e 75 6c 6c | 2e 20 20 54 68 65 20 6c |ply null|. The l|
|0000b240| 69 6e 65 0a 6e 75 6d 62 | 65 72 73 20 6f 6e 20 74 |ine.numb|ers on t|
|0000b250| 68 65 20 68 75 6e 6b 73 | 20 69 6e 20 74 68 65 20 |he hunks| in the |
|0000b260| 72 65 6a 65 63 74 20 66 | 69 6c 65 20 6d 61 79 20 |reject f|ile may |
|0000b270| 62 65 20 64 69 66 66 65 | 72 65 6e 74 20 66 72 6f |be diffe|rent fro|
|0000b280| 6d 20 74 68 6f 73 65 20 | 69 6e 0a 74 68 65 20 70 |m those |in.the p|
|0000b290| 61 74 63 68 20 66 69 6c | 65 3a 20 74 68 65 79 20 |atch fil|e: they |
|0000b2a0| 73 68 6f 77 20 74 68 65 | 20 61 70 70 72 6f 78 69 |show the| approxi|
|0000b2b0| 6d 61 74 65 20 6c 6f 63 | 61 74 69 6f 6e 20 77 68 |mate loc|ation wh|
|0000b2c0| 65 72 65 20 60 70 61 74 | 63 68 27 20 74 68 69 6e |ere `pat|ch' thin|
|0000b2d0| 6b 73 0a 74 68 65 20 66 | 61 69 6c 65 64 20 68 75 |ks.the f|ailed hu|
|0000b2e0| 6e 6b 73 20 62 65 6c 6f | 6e 67 20 69 6e 20 74 68 |nks belo|ng in th|
|0000b2f0| 65 20 6e 65 77 20 66 69 | 6c 65 20 72 61 74 68 65 |e new fi|le rathe|
|0000b300| 72 20 74 68 61 6e 20 69 | 6e 20 74 68 65 20 6f 6c |r than i|n the ol|
|0000b310| 64 20 6f 6e 65 2e 0a 0a | 20 20 20 41 73 20 69 74 |d one...| As it|
|0000b320| 20 63 6f 6d 70 6c 65 74 | 65 73 20 65 61 63 68 20 | complet|es each |
|0000b330| 68 75 6e 6b 2c 20 60 70 | 61 74 63 68 27 20 74 65 |hunk, `p|atch' te|
|0000b340| 6c 6c 73 20 79 6f 75 20 | 77 68 65 74 68 65 72 20 |lls you |whether |
|0000b350| 74 68 65 20 68 75 6e 6b | 0a 73 75 63 63 65 65 64 |the hunk|.succeed|
|0000b360| 65 64 20 6f 72 20 66 61 | 69 6c 65 64 2c 20 61 6e |ed or fa|iled, an|
|0000b370| 64 20 69 66 20 69 74 20 | 66 61 69 6c 65 64 2c 20 |d if it |failed, |
|0000b380| 6f 6e 20 77 68 69 63 68 | 20 6c 69 6e 65 20 28 69 |on which| line (i|
|0000b390| 6e 20 74 68 65 20 6e 65 | 77 20 66 69 6c 65 29 0a |n the ne|w file).|
|0000b3a0| 60 70 61 74 63 68 27 20 | 74 68 69 6e 6b 73 20 74 |`patch' |thinks t|
|0000b3b0| 68 65 20 68 75 6e 6b 20 | 73 68 6f 75 6c 64 20 67 |he hunk |should g|
|0000b3c0| 6f 2e 20 20 49 66 20 74 | 68 69 73 20 69 73 20 64 |o. If t|his is d|
|0000b3d0| 69 66 66 65 72 65 6e 74 | 20 66 72 6f 6d 20 74 68 |ifferent| from th|
|0000b3e0| 65 20 6c 69 6e 65 0a 6e | 75 6d 62 65 72 20 73 70 |e line.n|umber sp|
|0000b3f0| 65 63 69 66 69 65 64 20 | 69 6e 20 74 68 65 20 64 |ecified |in the d|
|0000b400| 69 66 66 2c 20 69 74 20 | 74 65 6c 6c 73 20 79 6f |iff, it |tells yo|
|0000b410| 75 20 74 68 65 20 6f 66 | 66 73 65 74 2e 20 20 41 |u the of|fset. A|
|0000b420| 20 73 69 6e 67 6c 65 20 | 6c 61 72 67 65 0a 6f 66 | single |large.of|
|0000b430| 66 73 65 74 20 2a 6d 61 | 79 2a 20 69 6e 64 69 63 |fset *ma|y* indic|
|0000b440| 61 74 65 20 74 68 61 74 | 20 60 70 61 74 63 68 27 |ate that| `patch'|
|0000b450| 20 69 6e 73 74 61 6c 6c | 65 64 20 61 20 68 75 6e | install|ed a hun|
|0000b460| 6b 20 69 6e 20 74 68 65 | 20 77 72 6f 6e 67 20 70 |k in the| wrong p|
|0000b470| 6c 61 63 65 2e 0a 60 70 | 61 74 63 68 27 20 61 6c |lace..`p|atch' al|
|0000b480| 73 6f 20 74 65 6c 6c 73 | 20 79 6f 75 20 69 66 20 |so tells| you if |
|0000b490| 69 74 20 75 73 65 64 20 | 61 20 66 75 7a 7a 20 66 |it used |a fuzz f|
|0000b4a0| 61 63 74 6f 72 20 74 6f | 20 6d 61 6b 65 20 74 68 |actor to| make th|
|0000b4b0| 65 20 6d 61 74 63 68 2c | 20 69 6e 0a 77 68 69 63 |e match,| in.whic|
|0000b4c0| 68 20 63 61 73 65 20 79 | 6f 75 20 73 68 6f 75 6c |h case y|ou shoul|
|0000b4d0| 64 20 61 6c 73 6f 20 62 | 65 20 73 6c 69 67 68 74 |d also b|e slight|
|0000b4e0| 6c 79 20 73 75 73 70 69 | 63 69 6f 75 73 2e 0a 0a |ly suspi|cious...|
|0000b4f0| 20 20 20 60 70 61 74 63 | 68 27 20 63 61 6e 6e 6f | `patc|h' canno|
|0000b500| 74 20 74 65 6c 6c 20 69 | 66 20 74 68 65 20 6c 69 |t tell i|f the li|
|0000b510| 6e 65 20 6e 75 6d 62 65 | 72 73 20 61 72 65 20 6f |ne numbe|rs are o|
|0000b520| 66 66 20 69 6e 20 61 6e | 20 60 65 64 27 20 73 63 |ff in an| `ed' sc|
|0000b530| 72 69 70 74 2c 0a 61 6e | 64 20 63 61 6e 20 6f 6e |ript,.an|d can on|
|0000b540| 6c 79 20 64 65 74 65 63 | 74 20 77 72 6f 6e 67 20 |ly detec|t wrong |
|0000b550| 6c 69 6e 65 20 6e 75 6d | 62 65 72 73 20 69 6e 20 |line num|bers in |
|0000b560| 61 20 6e 6f 72 6d 61 6c | 20 64 69 66 66 20 77 68 |a normal| diff wh|
|0000b570| 65 6e 20 69 74 20 66 69 | 6e 64 73 20 61 0a 63 68 |en it fi|nds a.ch|
|0000b580| 61 6e 67 65 20 6f 72 20 | 64 65 6c 65 74 65 20 63 |ange or |delete c|
|0000b590| 6f 6d 6d 61 6e 64 2e 20 | 20 49 74 20 6d 61 79 20 |ommand. | It may |
|0000b5a0| 68 61 76 65 20 74 68 65 | 20 73 61 6d 65 20 70 72 |have the| same pr|
|0000b5b0| 6f 62 6c 65 6d 20 77 69 | 74 68 20 61 20 63 6f 6e |oblem wi|th a con|
|0000b5c0| 74 65 78 74 0a 64 69 66 | 66 20 75 73 69 6e 67 20 |text.dif|f using |
|0000b5d0| 61 20 66 75 7a 7a 20 66 | 61 63 74 6f 72 20 65 71 |a fuzz f|actor eq|
|0000b5e0| 75 61 6c 20 74 6f 20 6f | 72 20 67 72 65 61 74 65 |ual to o|r greate|
|0000b5f0| 72 20 74 68 61 6e 20 74 | 68 65 20 6e 75 6d 62 65 |r than t|he numbe|
|0000b600| 72 20 6f 66 20 6c 69 6e | 65 73 0a 6f 66 20 63 6f |r of lin|es.of co|
|0000b610| 6e 74 65 78 74 20 73 68 | 6f 77 6e 20 69 6e 20 74 |ntext sh|own in t|
|0000b620| 68 65 20 64 69 66 66 20 | 28 74 79 70 69 63 61 6c |he diff |(typical|
|0000b630| 6c 79 20 33 29 2e 20 20 | 49 6e 20 74 68 65 73 65 |ly 3). |In these|
|0000b640| 20 63 61 73 65 73 2c 20 | 79 6f 75 20 73 68 6f 75 | cases, |you shou|
|0000b650| 6c 64 0a 70 72 6f 62 61 | 62 6c 79 20 6c 6f 6f 6b |ld.proba|bly look|
|0000b660| 20 61 74 20 61 20 63 6f | 6e 74 65 78 74 20 64 69 | at a co|ntext di|
|0000b670| 66 66 20 62 65 74 77 65 | 65 6e 20 79 6f 75 72 20 |ff betwe|en your |
|0000b680| 6f 72 69 67 69 6e 61 6c | 20 61 6e 64 20 70 61 74 |original| and pat|
|0000b690| 63 68 65 64 20 69 6e 70 | 75 74 0a 66 69 6c 65 73 |ched inp|ut.files|
|0000b6a0| 20 74 6f 20 73 65 65 20 | 69 66 20 74 68 65 20 63 | to see |if the c|
|0000b6b0| 68 61 6e 67 65 73 20 6d | 61 6b 65 20 73 65 6e 73 |hanges m|ake sens|
|0000b6c0| 65 2e 20 20 43 6f 6d 70 | 69 6c 69 6e 67 20 77 69 |e. Comp|iling wi|
|0000b6d0| 74 68 6f 75 74 20 65 72 | 72 6f 72 73 20 69 73 20 |thout er|rors is |
|0000b6e0| 61 0a 70 72 65 74 74 79 | 20 67 6f 6f 64 20 69 6e |a.pretty| good in|
|0000b6f0| 64 69 63 61 74 69 6f 6e | 20 74 68 61 74 20 74 68 |dication| that th|
|0000b700| 65 20 70 61 74 63 68 20 | 77 6f 72 6b 65 64 2c 20 |e patch |worked, |
|0000b710| 62 75 74 20 6e 6f 74 20 | 61 20 67 75 61 72 61 6e |but not |a guaran|
|0000b720| 74 65 65 2e 0a 0a 20 20 | 20 60 70 61 74 63 68 27 |tee... | `patch'|
|0000b730| 20 75 73 75 61 6c 6c 79 | 20 70 72 6f 64 75 63 65 | usually| produce|
|0000b740| 73 20 74 68 65 20 63 6f | 72 72 65 63 74 20 72 65 |s the co|rrect re|
|0000b750| 73 75 6c 74 73 2c 20 65 | 76 65 6e 20 77 68 65 6e |sults, e|ven when|
|0000b760| 20 69 74 20 6d 75 73 74 | 20 6d 61 6b 65 0a 6d 61 | it must| make.ma|
|0000b770| 6e 79 20 67 75 65 73 73 | 65 73 2e 20 20 48 6f 77 |ny guess|es. How|
|0000b780| 65 76 65 72 2c 20 74 68 | 65 20 72 65 73 75 6c 74 |ever, th|e result|
|0000b790| 73 20 61 72 65 20 67 75 | 61 72 61 6e 74 65 65 64 |s are gu|aranteed|
|0000b7a0| 20 6f 6e 6c 79 20 77 68 | 65 6e 20 74 68 65 20 70 | only wh|en the p|
|0000b7b0| 61 74 63 68 0a 69 73 20 | 61 70 70 6c 69 65 64 20 |atch.is |applied |
|0000b7c0| 74 6f 20 61 6e 20 65 78 | 61 63 74 20 63 6f 70 79 |to an ex|act copy|
|0000b7d0| 20 6f 66 20 74 68 65 20 | 66 69 6c 65 20 74 68 61 | of the |file tha|
|0000b7e0| 74 20 74 68 65 20 70 61 | 74 63 68 20 77 61 73 20 |t the pa|tch was |
|0000b7f0| 67 65 6e 65 72 61 74 65 | 64 0a 66 72 6f 6d 2e 0a |generate|d.from..|
|0000b800| 0a 1f 0a 46 69 6c 65 3a | 20 64 69 66 66 2e 69 6e |...File:| diff.in|
|0000b810| 66 6f 2c 20 20 4e 6f 64 | 65 3a 20 45 6d 70 74 79 |fo, Nod|e: Empty|
|0000b820| 20 46 69 6c 65 73 2c 20 | 20 4e 65 78 74 3a 20 4d | Files, | Next: M|
|0000b830| 75 6c 74 69 70 6c 65 20 | 50 61 74 63 68 65 73 2c |ultiple |Patches,|
|0000b840| 20 20 50 72 65 76 3a 20 | 49 6d 70 65 72 66 65 63 | Prev: |Imperfec|
|0000b850| 74 2c 20 20 55 70 3a 20 | 4d 65 72 67 69 6e 67 20 |t, Up: |Merging |
|0000b860| 77 69 74 68 20 70 61 74 | 63 68 0a 0a 52 65 6d 6f |with pat|ch..Remo|
|0000b870| 76 69 6e 67 20 45 6d 70 | 74 79 20 46 69 6c 65 73 |ving Emp|ty Files|
|0000b880| 0a 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |.=======|========|
|0000b890| 3d 3d 3d 3d 3d 0a 0a 20 | 20 20 53 6f 6d 65 74 69 |=====.. | Someti|
|0000b8a0| 6d 65 73 20 77 68 65 6e | 20 63 6f 6d 70 61 72 69 |mes when| compari|
|0000b8b0| 6e 67 20 74 77 6f 20 64 | 69 72 65 63 74 6f 72 69 |ng two d|irectori|
|0000b8c0| 65 73 2c 20 74 68 65 20 | 66 69 72 73 74 20 64 69 |es, the |first di|
|0000b8d0| 72 65 63 74 6f 72 79 0a | 63 6f 6e 74 61 69 6e 73 |rectory.|contains|
|0000b8e0| 20 61 20 66 69 6c 65 20 | 74 68 61 74 20 74 68 65 | a file |that the|
|0000b8f0| 20 73 65 63 6f 6e 64 20 | 64 69 72 65 63 74 6f 72 | second |director|
|0000b900| 79 20 64 6f 65 73 20 6e | 6f 74 2e 20 20 49 66 20 |y does n|ot. If |
|0000b910| 79 6f 75 20 67 69 76 65 | 20 60 64 69 66 66 27 0a |you give| `diff'.|
|0000b920| 74 68 65 20 60 2d 4e 27 | 20 6f 72 20 60 2d 2d 6e |the `-N'| or `--n|
|0000b930| 65 77 2d 66 69 6c 65 27 | 20 6f 70 74 69 6f 6e 2c |ew-file'| option,|
|0000b940| 20 69 74 20 6f 75 74 70 | 75 74 73 20 61 20 64 69 | it outp|uts a di|
|0000b950| 66 66 20 74 68 61 74 20 | 64 65 6c 65 74 65 73 20 |ff that |deletes |
|0000b960| 74 68 65 0a 63 6f 6e 74 | 65 6e 74 73 20 6f 66 20 |the.cont|ents of |
|0000b970| 74 68 69 73 20 66 69 6c | 65 2e 20 20 42 79 20 64 |this fil|e. By d|
|0000b980| 65 66 61 75 6c 74 2c 20 | 60 70 61 74 63 68 27 20 |efault, |`patch' |
|0000b990| 6c 65 61 76 65 73 20 61 | 6e 20 65 6d 70 74 79 20 |leaves a|n empty |
|0000b9a0| 66 69 6c 65 20 61 66 74 | 65 72 0a 61 70 70 6c 79 |file aft|er.apply|
|0000b9b0| 69 6e 67 20 73 75 63 68 | 20 61 20 64 69 66 66 2e |ing such| a diff.|
|0000b9c0| 20 20 54 68 65 20 60 2d | 45 27 20 6f 72 20 60 2d | The `-|E' or `-|
|0000b9d0| 2d 72 65 6d 6f 76 65 2d | 65 6d 70 74 79 2d 66 69 |-remove-|empty-fi|
|0000b9e0| 6c 65 73 27 20 6f 70 74 | 69 6f 6e 20 74 6f 0a 60 |les' opt|ion to.`|
|0000b9f0| 70 61 74 63 68 27 20 64 | 65 6c 65 74 65 73 20 6f |patch' d|eletes o|
|0000ba00| 75 74 70 75 74 20 66 69 | 6c 65 73 20 74 68 61 74 |utput fi|les that|
|0000ba10| 20 61 72 65 20 65 6d 70 | 74 79 20 61 66 74 65 72 | are emp|ty after|
|0000ba20| 20 61 70 70 6c 79 69 6e | 67 20 74 68 65 20 64 69 | applyin|g the di|
|0000ba30| 66 66 2e 0a 0a 1f 0a 46 | 69 6c 65 3a 20 64 69 66 |ff.....F|ile: dif|
|0000ba40| 66 2e 69 6e 66 6f 2c 20 | 20 4e 6f 64 65 3a 20 4d |f.info, | Node: M|
|0000ba50| 75 6c 74 69 70 6c 65 20 | 50 61 74 63 68 65 73 2c |ultiple |Patches,|
|0000ba60| 20 20 4e 65 78 74 3a 20 | 70 61 74 63 68 20 4d 65 | Next: |patch Me|
|0000ba70| 73 73 61 67 65 73 2c 20 | 20 50 72 65 76 3a 20 45 |ssages, | Prev: E|
|0000ba80| 6d 70 74 79 20 46 69 6c | 65 73 2c 20 20 55 70 3a |mpty Fil|es, Up:|
|0000ba90| 20 4d 65 72 67 69 6e 67 | 20 77 69 74 68 20 70 61 | Merging| with pa|
|0000baa0| 74 63 68 0a 0a 4d 75 6c | 74 69 70 6c 65 20 50 61 |tch..Mul|tiple Pa|
|0000bab0| 74 63 68 65 73 20 69 6e | 20 61 20 46 69 6c 65 0a |tches in| a File.|
|0000bac0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|0000bad0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 0a 0a 20 20 20 49 |========|==.. I|
|0000bae0| 66 20 74 68 65 20 70 61 | 74 63 68 20 66 69 6c 65 |f the pa|tch file|
|0000baf0| 20 63 6f 6e 74 61 69 6e | 73 20 6d 6f 72 65 20 74 | contain|s more t|
|0000bb00| 68 61 6e 20 6f 6e 65 20 | 70 61 74 63 68 2c 20 60 |han one |patch, `|
|0000bb10| 70 61 74 63 68 27 20 74 | 72 69 65 73 20 74 6f 0a |patch' t|ries to.|
|0000bb20| 61 70 70 6c 79 20 65 61 | 63 68 20 6f 66 20 74 68 |apply ea|ch of th|
|0000bb30| 65 6d 20 61 73 20 69 66 | 20 74 68 65 79 20 63 61 |em as if| they ca|
|0000bb40| 6d 65 20 66 72 6f 6d 20 | 73 65 70 61 72 61 74 65 |me from |separate|
|0000bb50| 20 70 61 74 63 68 20 66 | 69 6c 65 73 2e 20 20 54 | patch f|iles. T|
|0000bb60| 68 69 73 0a 6d 65 61 6e | 73 20 74 68 61 74 20 69 |his.mean|s that i|
|0000bb70| 74 20 64 65 74 65 72 6d | 69 6e 65 73 20 74 68 65 |t determ|ines the|
|0000bb80| 20 6e 61 6d 65 20 6f 66 | 20 74 68 65 20 66 69 6c | name of| the fil|
|0000bb90| 65 20 74 6f 20 70 61 74 | 63 68 20 66 6f 72 20 65 |e to pat|ch for e|
|0000bba0| 61 63 68 20 70 61 74 63 | 68 2c 0a 61 6e 64 20 74 |ach patc|h,.and t|
|0000bbb0| 68 61 74 20 69 74 20 65 | 78 61 6d 69 6e 65 73 20 |hat it e|xamines |
|0000bbc0| 74 68 65 20 6c 65 61 64 | 69 6e 67 20 74 65 78 74 |the lead|ing text|
|0000bbd0| 20 62 65 66 6f 72 65 20 | 65 61 63 68 20 70 61 74 | before |each pat|
|0000bbe0| 63 68 20 66 6f 72 20 66 | 69 6c 65 20 6e 61 6d 65 |ch for f|ile name|
|0000bbf0| 73 0a 61 6e 64 20 70 72 | 65 72 65 71 75 69 73 69 |s.and pr|erequisi|
|0000bc00| 74 65 20 72 65 76 69 73 | 69 6f 6e 20 6c 65 76 65 |te revis|ion leve|
|0000bc10| 6c 20 28 2a 6e 6f 74 65 | 20 4d 61 6b 69 6e 67 20 |l (*note| Making |
|0000bc20| 50 61 74 63 68 65 73 3a | 3a 2e 2c 20 66 6f 72 20 |Patches:|:., for |
|0000bc30| 6d 6f 72 65 20 6f 6e 0a | 74 68 61 74 20 74 6f 70 |more on.|that top|
|0000bc40| 69 63 29 2e 0a 0a 20 20 | 20 46 6f 72 20 74 68 65 |ic)... | For the|
|0000bc50| 20 73 65 63 6f 6e 64 20 | 61 6e 64 20 73 75 62 73 | second |and subs|
|0000bc60| 65 71 75 65 6e 74 20 70 | 61 74 63 68 65 73 20 69 |equent p|atches i|
|0000bc70| 6e 20 74 68 65 20 70 61 | 74 63 68 20 66 69 6c 65 |n the pa|tch file|
|0000bc80| 2c 20 79 6f 75 20 63 61 | 6e 20 67 69 76 65 0a 6f |, you ca|n give.o|
|0000bc90| 70 74 69 6f 6e 73 20 61 | 6e 64 20 61 6e 6f 74 68 |ptions a|nd anoth|
|0000bca0| 65 72 20 6f 72 69 67 69 | 6e 61 6c 20 66 69 6c 65 |er origi|nal file|
|0000bcb0| 20 6e 61 6d 65 20 62 79 | 20 73 65 70 61 72 61 74 | name by| separat|
|0000bcc0| 69 6e 67 20 74 68 65 69 | 72 20 61 72 67 75 6d 65 |ing thei|r argume|
|0000bcd0| 6e 74 0a 6c 69 73 74 73 | 20 77 69 74 68 20 61 20 |nt.lists| with a |
|0000bce0| 60 2b 27 2e 20 20 48 6f | 77 65 76 65 72 2c 20 74 |`+'. Ho|wever, t|
|0000bcf0| 68 65 20 61 72 67 75 6d | 65 6e 74 20 6c 69 73 74 |he argum|ent list|
|0000bd00| 20 66 6f 72 20 61 20 73 | 65 63 6f 6e 64 20 6f 72 | for a s|econd or|
|0000bd10| 0a 73 75 62 73 65 71 75 | 65 6e 74 20 70 61 74 63 |.subsequ|ent patc|
|0000bd20| 68 20 6d 61 79 20 6e 6f | 74 20 73 70 65 63 69 66 |h may no|t specif|
|0000bd30| 79 20 61 20 6e 65 77 20 | 70 61 74 63 68 20 66 69 |y a new |patch fi|
|0000bd40| 6c 65 2c 20 73 69 6e 63 | 65 20 74 68 61 74 20 64 |le, sinc|e that d|
|0000bd50| 6f 65 73 20 6e 6f 74 0a | 6d 61 6b 65 20 73 65 6e |oes not.|make sen|
|0000bd60| 73 65 2e 0a 0a 20 20 20 | 46 6f 72 20 65 78 61 6d |se... |For exam|
|0000bd70| 70 6c 65 2c 20 74 6f 20 | 74 65 6c 6c 20 60 70 61 |ple, to |tell `pa|
|0000bd80| 74 63 68 27 20 74 6f 20 | 73 74 72 69 70 20 74 68 |tch' to |strip th|
|0000bd90| 65 20 66 69 72 73 74 20 | 74 68 72 65 65 20 73 6c |e first |three sl|
|0000bda0| 61 73 68 65 73 20 66 72 | 6f 6d 0a 74 68 65 20 6e |ashes fr|om.the n|
|0000bdb0| 61 6d 65 20 6f 66 20 74 | 68 65 20 66 69 72 73 74 |ame of t|he first|
|0000bdc0| 20 70 61 74 63 68 20 69 | 6e 20 74 68 65 20 70 61 | patch i|n the pa|
|0000bdd0| 74 63 68 20 66 69 6c 65 | 20 61 6e 64 20 6e 6f 6e |tch file| and non|
|0000bde0| 65 20 66 72 6f 6d 20 73 | 75 62 73 65 71 75 65 6e |e from s|ubsequen|
|0000bdf0| 74 0a 70 61 74 63 68 65 | 73 2c 20 61 6e 64 20 74 |t.patche|s, and t|
|0000be00| 6f 20 75 73 65 20 60 63 | 6f 64 65 2e 63 27 20 61 |o use `c|ode.c' a|
|0000be10| 73 20 74 68 65 20 66 69 | 72 73 74 20 69 6e 70 75 |s the fi|rst inpu|
|0000be20| 74 20 66 69 6c 65 2c 20 | 79 6f 75 20 63 61 6e 20 |t file, |you can |
|0000be30| 75 73 65 3a 0a 0a 20 20 | 20 20 20 70 61 74 63 68 |use:.. | patch|
|0000be40| 20 2d 70 33 20 63 6f 64 | 65 2e 63 20 2b 20 2d 70 | -p3 cod|e.c + -p|
|0000be50| 30 20 3c 20 70 61 74 63 | 68 66 69 6c 65 0a 0a 20 |0 < patc|hfile.. |
|0000be60| 20 20 54 68 65 20 60 2d | 53 27 20 6f 72 20 60 2d | The `-|S' or `-|
|0000be70| 2d 73 6b 69 70 27 20 6f | 70 74 69 6f 6e 20 69 67 |-skip' o|ption ig|
|0000be80| 6e 6f 72 65 73 20 74 68 | 65 20 63 75 72 72 65 6e |nores th|e curren|
|0000be90| 74 20 70 61 74 63 68 20 | 66 72 6f 6d 20 74 68 65 |t patch |from the|
|0000bea0| 20 70 61 74 63 68 0a 66 | 69 6c 65 2c 20 62 75 74 | patch.f|ile, but|
|0000beb0| 20 63 6f 6e 74 69 6e 75 | 65 20 6c 6f 6f 6b 69 6e | continu|e lookin|
|0000bec0| 67 20 66 6f 72 20 74 68 | 65 20 6e 65 78 74 20 70 |g for th|e next p|
|0000bed0| 61 74 63 68 20 69 6e 20 | 74 68 65 20 66 69 6c 65 |atch in |the file|
|0000bee0| 2e 20 20 54 68 75 73 2c | 20 74 6f 0a 69 67 6e 6f |. Thus,| to.igno|
|0000bef0| 72 65 20 74 68 65 20 66 | 69 72 73 74 20 61 6e 64 |re the f|irst and|
|0000bf00| 20 74 68 69 72 64 20 70 | 61 74 63 68 65 73 20 69 | third p|atches i|
|0000bf10| 6e 20 74 68 65 20 70 61 | 74 63 68 20 66 69 6c 65 |n the pa|tch file|
|0000bf20| 2c 20 79 6f 75 20 63 61 | 6e 20 75 73 65 3a 0a 0a |, you ca|n use:..|
|0000bf30| 20 20 20 20 20 70 61 74 | 63 68 20 2d 53 20 2b 20 | pat|ch -S + |
|0000bf40| 2b 20 2d 53 20 2b 20 3c | 20 70 61 74 63 68 20 66 |+ -S + <| patch f|
|0000bf50| 69 6c 65 0a 0a 1f 0a 46 | 69 6c 65 3a 20 64 69 66 |ile....F|ile: dif|
|0000bf60| 66 2e 69 6e 66 6f 2c 20 | 20 4e 6f 64 65 3a 20 70 |f.info, | Node: p|
|0000bf70| 61 74 63 68 20 4d 65 73 | 73 61 67 65 73 2c 20 20 |atch Mes|sages, |
|0000bf80| 50 72 65 76 3a 20 4d 75 | 6c 74 69 70 6c 65 20 50 |Prev: Mu|ltiple P|
|0000bf90| 61 74 63 68 65 73 2c 20 | 20 55 70 3a 20 4d 65 72 |atches, | Up: Mer|
|0000bfa0| 67 69 6e 67 20 77 69 74 | 68 20 70 61 74 63 68 0a |ging wit|h patch.|
|0000bfb0| 0a 4d 65 73 73 61 67 65 | 73 20 61 6e 64 20 51 75 |.Message|s and Qu|
|0000bfc0| 65 73 74 69 6f 6e 73 20 | 66 72 6f 6d 20 60 70 61 |estions |from `pa|
|0000bfd0| 74 63 68 27 0a 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |tch'.===|========|
|0000bfe0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|0000bff0| 3d 3d 3d 3d 3d 3d 3d 3d | 0a 0a 20 20 20 60 70 61 |========|.. `pa|
|0000c000| 74 63 68 27 20 63 61 6e | 20 70 72 6f 64 75 63 65 |tch' can| produce|
|0000c010| 20 61 20 76 61 72 69 65 | 74 79 20 6f 66 20 6d 65 | a varie|ty of me|
|0000c020| 73 73 61 67 65 73 2c 20 | 65 73 70 65 63 69 61 6c |ssages, |especial|
|0000c030| 6c 79 20 69 66 20 69 74 | 20 68 61 73 0a 74 72 6f |ly if it| has.tro|
|0000c040| 75 62 6c 65 20 64 65 63 | 6f 64 69 6e 67 20 69 74 |uble dec|oding it|
|0000c050| 73 20 69 6e 70 75 74 2e | 20 20 49 6e 20 61 20 66 |s input.| In a f|
|0000c060| 65 77 20 73 69 74 75 61 | 74 69 6f 6e 73 20 77 68 |ew situa|tions wh|
|0000c070| 65 72 65 20 69 74 27 73 | 20 6e 6f 74 20 73 75 72 |ere it's| not sur|
|0000c080| 65 20 68 6f 77 0a 74 6f | 20 70 72 6f 63 65 65 64 |e how.to| proceed|
|0000c090| 2c 20 60 70 61 74 63 68 | 27 20 6e 6f 72 6d 61 6c |, `patch|' normal|
|0000c0a0| 6c 79 20 70 72 6f 6d 70 | 74 73 20 79 6f 75 20 66 |ly promp|ts you f|
|0000c0b0| 6f 72 20 6d 6f 72 65 20 | 69 6e 66 6f 72 6d 61 74 |or more |informat|
|0000c0c0| 69 6f 6e 20 66 72 6f 6d | 20 74 68 65 0a 6b 65 79 |ion from| the.key|
|0000c0d0| 62 6f 61 72 64 2e 20 20 | 54 68 65 72 65 20 61 72 |board. |There ar|
|0000c0e0| 65 20 6f 70 74 69 6f 6e | 73 20 74 6f 20 73 75 70 |e option|s to sup|
|0000c0f0| 70 72 65 73 73 20 70 72 | 69 6e 74 69 6e 67 20 6e |press pr|inting n|
|0000c100| 6f 6e 2d 66 61 74 61 6c | 20 6d 65 73 73 61 67 65 |on-fatal| message|
|0000c110| 73 0a 61 6e 64 20 73 74 | 6f 70 70 69 6e 67 20 66 |s.and st|opping f|
|0000c120| 6f 72 20 6b 65 79 62 6f | 61 72 64 20 69 6e 70 75 |or keybo|ard inpu|
|0000c130| 74 2e 0a 0a 20 20 20 54 | 68 65 20 6d 65 73 73 61 |t... T|he messa|
|0000c140| 67 65 20 60 48 6d 6d 2e | 2e 2e 27 20 69 6e 64 69 |ge `Hmm.|..' indi|
|0000c150| 63 61 74 65 73 20 74 68 | 61 74 20 60 70 61 74 63 |cates th|at `patc|
|0000c160| 68 27 20 69 73 20 72 65 | 61 64 69 6e 67 20 74 65 |h' is re|ading te|
|0000c170| 78 74 20 69 6e 20 74 68 | 65 0a 70 61 74 63 68 20 |xt in th|e.patch |
|0000c180| 66 69 6c 65 2c 20 61 74 | 74 65 6d 70 74 69 6e 67 |file, at|tempting|
|0000c190| 20 74 6f 20 64 65 74 65 | 72 6d 69 6e 65 20 77 68 | to dete|rmine wh|
|0000c1a0| 65 74 68 65 72 20 74 68 | 65 72 65 20 69 73 20 61 |ether th|ere is a|
|0000c1b0| 20 70 61 74 63 68 20 69 | 6e 20 74 68 61 74 0a 74 | patch i|n that.t|
|0000c1c0| 65 78 74 2c 20 61 6e 64 | 20 69 66 20 73 6f 2c 20 |ext, and| if so, |
|0000c1d0| 77 68 61 74 20 6b 69 6e | 64 20 6f 66 20 70 61 74 |what kin|d of pat|
|0000c1e0| 63 68 20 69 74 20 69 73 | 2e 0a 0a 20 20 20 59 6f |ch it is|... Yo|
|0000c1f0| 75 20 63 61 6e 20 69 6e | 68 69 62 69 74 20 61 6c |u can in|hibit al|
|0000c200| 6c 20 74 65 72 6d 69 6e | 61 6c 20 6f 75 74 70 75 |l termin|al outpu|
|0000c210| 74 20 66 72 6f 6d 20 60 | 70 61 74 63 68 27 2c 20 |t from `|patch', |
|0000c220| 75 6e 6c 65 73 73 20 61 | 6e 20 65 72 72 6f 72 0a |unless a|n error.|
|0000c230| 6f 63 63 75 72 73 2c 20 | 62 79 20 75 73 69 6e 67 |occurs, |by using|
|0000c240| 20 74 68 65 20 60 2d 73 | 27 2c 20 60 2d 2d 71 75 | the `-s|', `--qu|
|0000c250| 69 65 74 27 2c 20 6f 72 | 20 60 2d 2d 73 69 6c 65 |iet', or| `--sile|
|0000c260| 6e 74 27 20 6f 70 74 69 | 6f 6e 2e 0a 0a 20 20 20 |nt' opti|on... |
|0000c270| 54 68 65 72 65 20 61 72 | 65 20 74 77 6f 20 77 61 |There ar|e two wa|
|0000c280| 79 73 20 79 6f 75 20 63 | 61 6e 20 70 72 65 76 65 |ys you c|an preve|
|0000c290| 6e 74 20 60 70 61 74 63 | 68 27 20 66 72 6f 6d 20 |nt `patc|h' from |
|0000c2a0| 61 73 6b 69 6e 67 20 79 | 6f 75 20 61 6e 79 0a 71 |asking y|ou any.q|
|0000c2b0| 75 65 73 74 69 6f 6e 73 | 2e 20 20 54 68 65 20 60 |uestions|. The `|
|0000c2c0| 2d 66 27 20 6f 72 20 60 | 2d 2d 66 6f 72 63 65 27 |-f' or `|--force'|
|0000c2d0| 20 6f 70 74 69 6f 6e 20 | 61 73 73 75 6d 65 73 20 | option |assumes |
|0000c2e0| 74 68 61 74 20 79 6f 75 | 20 6b 6e 6f 77 20 77 68 |that you| know wh|
|0000c2f0| 61 74 20 79 6f 75 0a 61 | 72 65 20 64 6f 69 6e 67 |at you.a|re doing|
|0000c300| 2e 20 20 49 74 20 61 73 | 73 75 6d 65 73 20 74 68 |. It as|sumes th|
|0000c310| 65 20 66 6f 6c 6c 6f 77 | 69 6e 67 3a 0a 0a 20 20 |e follow|ing:.. |
|0000c320| 20 2a 20 73 6b 69 70 20 | 70 61 74 63 68 65 73 20 | * skip |patches |
|0000c330| 74 68 61 74 20 64 6f 20 | 6e 6f 74 20 63 6f 6e 74 |that do |not cont|
|0000c340| 61 69 6e 20 66 69 6c 65 | 20 6e 61 6d 65 73 20 69 |ain file| names i|
|0000c350| 6e 20 74 68 65 69 72 20 | 68 65 61 64 65 72 73 3b |n their |headers;|
|0000c360| 0a 0a 20 20 20 2a 20 70 | 61 74 63 68 20 66 69 6c |.. * p|atch fil|
|0000c370| 65 73 20 65 76 65 6e 20 | 74 68 6f 75 67 68 20 74 |es even |though t|
|0000c380| 68 65 79 20 68 61 76 65 | 20 74 68 65 20 77 72 6f |hey have| the wro|
|0000c390| 6e 67 20 76 65 72 73 69 | 6f 6e 20 66 6f 72 20 74 |ng versi|on for t|
|0000c3a0| 68 65 0a 20 20 20 20 20 | 60 50 72 65 72 65 71 3a |he. |`Prereq:|
|0000c3b0| 27 20 6c 69 6e 65 20 69 | 6e 20 74 68 65 20 70 61 |' line i|n the pa|
|0000c3c0| 74 63 68 3b 0a 0a 20 20 | 20 2a 20 61 73 73 75 6d |tch;.. | * assum|
|0000c3d0| 65 20 74 68 61 74 20 70 | 61 74 63 68 65 73 20 61 |e that p|atches a|
|0000c3e0| 72 65 20 6e 6f 74 20 72 | 65 76 65 72 73 65 64 20 |re not r|eversed |
|0000c3f0| 65 76 65 6e 20 69 66 20 | 74 68 65 79 20 6c 6f 6f |even if |they loo|
|0000c400| 6b 20 6c 69 6b 65 20 74 | 68 65 79 0a 20 20 20 20 |k like t|hey. |
|0000c410| 20 61 72 65 2e 0a 0a 20 | 20 20 54 68 65 20 60 2d | are... | The `-|
|0000c420| 74 27 20 6f 72 20 60 2d | 2d 62 61 74 63 68 27 20 |t' or `-|-batch' |
|0000c430| 6f 70 74 69 6f 6e 20 69 | 73 20 73 69 6d 69 6c 61 |option i|s simila|
|0000c440| 72 20 74 6f 20 60 2d 66 | 27 2c 20 69 6e 20 74 68 |r to `-f|', in th|
|0000c450| 61 74 20 69 74 0a 73 75 | 70 70 72 65 73 73 65 73 |at it.su|ppresses|
|0000c460| 20 71 75 65 73 74 69 6f | 6e 73 2c 20 62 75 74 20 | questio|ns, but |
|0000c470| 69 74 20 6d 61 6b 65 73 | 20 73 6f 6d 65 77 68 61 |it makes| somewha|
|0000c480| 74 20 64 69 66 66 65 72 | 65 6e 74 20 61 73 73 75 |t differ|ent assu|
|0000c490| 6d 70 74 69 6f 6e 73 3a | 0a 0a 20 20 20 2a 20 73 |mptions:|.. * s|
|0000c4a0| 6b 69 70 20 70 61 74 63 | 68 65 73 20 74 68 61 74 |kip patc|hes that|
|0000c4b0| 20 64 6f 20 6e 6f 74 20 | 63 6f 6e 74 61 69 6e 20 | do not |contain |
|0000c4c0| 66 69 6c 65 20 6e 61 6d | 65 73 20 69 6e 20 74 68 |file nam|es in th|
|0000c4d0| 65 69 72 20 68 65 61 64 | 65 72 73 20 28 74 68 65 |eir head|ers (the|
|0000c4e0| 0a 20 20 20 20 20 73 61 | 6d 65 20 61 73 20 60 2d |. sa|me as `-|
|0000c4f0| 66 27 29 3b 0a 0a 20 20 | 20 2a 20 73 6b 69 70 20 |f');.. | * skip |
|0000c500| 70 61 74 63 68 65 73 20 | 66 6f 72 20 77 68 69 63 |patches |for whic|
|0000c510| 68 20 74 68 65 20 66 69 | 6c 65 20 68 61 73 20 74 |h the fi|le has t|
|0000c520| 68 65 20 77 72 6f 6e 67 | 20 76 65 72 73 69 6f 6e |he wrong| version|
|0000c530| 20 66 6f 72 20 74 68 65 | 0a 20 20 20 20 20 60 50 | for the|. `P|
|0000c540| 72 65 72 65 71 3a 27 20 | 6c 69 6e 65 20 69 6e 20 |rereq:' |line in |
|0000c550| 74 68 65 20 70 61 74 63 | 68 3b 0a 0a 20 20 20 2a |the patc|h;.. *|
|0000c560| 20 61 73 73 75 6d 65 20 | 74 68 61 74 20 70 61 74 | assume |that pat|
|0000c570| 63 68 65 73 20 61 72 65 | 20 72 65 76 65 72 73 65 |ches are| reverse|
|0000c580| 64 20 69 66 20 74 68 65 | 79 20 6c 6f 6f 6b 20 6c |d if the|y look l|
|0000c590| 69 6b 65 20 74 68 65 79 | 20 61 72 65 2e 0a 0a 20 |ike they| are... |
|0000c5a0| 20 20 60 70 61 74 63 68 | 27 20 65 78 69 74 73 20 | `patch|' exits |
|0000c5b0| 77 69 74 68 20 61 20 6e | 6f 6e 2d 7a 65 72 6f 20 |with a n|on-zero |
|0000c5c0| 73 74 61 74 75 73 20 69 | 66 20 69 74 20 63 72 65 |status i|f it cre|
|0000c5d0| 61 74 65 73 20 61 6e 79 | 20 72 65 6a 65 63 74 20 |ates any| reject |
|0000c5e0| 66 69 6c 65 73 2e 0a 57 | 68 65 6e 20 61 70 70 6c |files..W|hen appl|
|0000c5f0| 79 69 6e 67 20 61 20 73 | 65 74 20 6f 66 20 70 61 |ying a s|et of pa|
|0000c600| 74 63 68 65 73 20 69 6e | 20 61 20 6c 6f 6f 70 2c |tches in| a loop,|
|0000c610| 20 79 6f 75 20 73 68 6f | 75 6c 64 20 63 68 65 63 | you sho|uld chec|
|0000c620| 6b 20 74 68 65 20 65 78 | 69 74 0a 73 74 61 74 75 |k the ex|it.statu|
|0000c630| 73 2c 20 73 6f 20 79 6f | 75 20 64 6f 6e 27 74 20 |s, so yo|u don't |
|0000c640| 61 70 70 6c 79 20 61 20 | 6c 61 74 65 72 20 70 61 |apply a |later pa|
|0000c650| 74 63 68 20 74 6f 20 61 | 20 70 61 72 74 69 61 6c |tch to a| partial|
|0000c660| 6c 79 20 70 61 74 63 68 | 65 64 20 66 69 6c 65 2e |ly patch|ed file.|
|0000c670| 0a 0a | |.. | |
+--------+-------------------------+-------------------------+--------+--------+
