1 .\" You may copy, distribute and modify under the terms of the LDP General
2 .\" Public License as specified in the LICENSE file that comes with the
3 .\" gnumaniak distribution
5 .\" The author kindly requests that no comments regarding the "better"
6 .\" suitability or up-to-date notices of any info documentation alternative
7 .\" is added without contacting him first.
9 .\" (C) 2002 Ragnar Hojland Espinosa <ragnar@ragnar-hojland.com>
12 .\" man pages are NOT obsolete!
13 .\" <ragnar@ragnar-hojland.com>
15 .\" Japanese Version Copyright (c) 2000 NAKANO Takeo all rights reserved.
16 .\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
17 .\" Updated & Modified Sat Jan 24 10:40:25 JST 2004
18 .\" by Yuichi SATO <ysato444@yahoo.co.jp>
20 .\"WORD: context ¥³¥ó¥Æ¥¯¥¹¥È
21 .\"WORD: format ·Á¼°¡¢[ʸ̮¤Ë¤è¤Ã¤Æ] À°·Á (¤¹¤ë)
22 .\"WORD: recursively ºÆµ¢Åª¤Ë
23 .\"WORD: basename ¥Õ¥¡¥¤¥ë̾¤Î base Éô [¶ì¤·¤¤...]
24 .\"WORD: heuristics ¥Ò¥å¡¼¥ê¥¹¥Æ¥£¥Ã¥¯¤Ê¼êË¡
25 .\"WORD: header ¥Ø¥Ã¥À
27 .\"WORD: (in)complete ¹ÔËö¤Ë²þ¹Ô¤¬¤¢¤ë (¤Ê¤¤)
28 .\"WORD: null character ¥Ê¥ëʸ»ú
30 .TH DIFF 1 "October 2002" "GNU diff Utilities 2.8.1"
32 diff \- 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Î°ã¤¤¤òõ¤¹
35 [\fB\-abcdefhilnpqrstuwyBEHNPT\fR]
37 [\fB\-x \fIPATTERN\fR]
45 [\fB\-W \fICOLUMNS\fR]
49 [\fB\-\-changed\-group\-format=\fIfORMAT\fR]
50 [\fB\-\-context\fR[\fB=\fILINES\fR]]
51 [\fB\-\-diff\-program=\fIPROGRAM\fR]
53 [\fB\-\-exclude=\fIPATTERN\fR]
54 [\fB\-\-exclude-from=\fIFILE\fR]
55 [\fB\-\-expand\-tabs\fR]
56 [\fB\-\-forward\-ed\fR]
57 [\fB\-\-from\-file=\fIFILE\fR]
58 [\fB\-\-horizon\-lines=\fILINES\fR]
59 [\fB\-\-ifdef=\fINAME\fR]
60 [\fB\-\-ignore\-all\-space\fR]
61 [\fB\-\-ignore\-blank\-lines\fR]
62 [\fB\-\-ignore\-case\fR]
63 [\fB\-\-ignore\-file\-name\-case\fR]
64 [\fB\-\-ignore\-matching\-lines=\fIREGEXP\fR]
65 [\fB\-\-ignore\-space\-change\fR]
66 [\fB\-\-ignore\-tab\-expansion\fR]
67 [\fB\-\-inhibit\-hunk\-merge\fR]
69 [\fB\-\-label=\fILABEL\fR]
70 [\fB\-\-left\-column\fR]
71 [\fB\-\-line\-format=\fIFORMAT\fR]
74 [\fB\-\-new\-group\-format=\fIFORMAT\fR]
75 [\fB\-\-new\-line\-format=\fIFORMAT\fR]
76 [\fB\-\-no\-ignore\-file\-name\-case]
77 [\fB\-\-old\-group\-format=\fIFORMAT\fR]
78 [\fB\-\-old\-line\-format=\fIFORMAT\fR]
79 [\fB\-\-paginate\fR] [\fB\-\-rcs\fR]
81 [\fB\-\-report\-identical\-files\fR]
82 [\fB\-\-sdiff\-merge\-assist\fR]
83 [\fB\-\-show\-c\-function\fR]
84 [\fB\-\-show\-function\-line=\fIREGEXP\fR]
85 [\fB\-\-side\-by\-side\fR]
86 [\fB\-\-speed\-large\-files\fR]
87 [\fB\-\-starting\-file=\fIFILE\fR]
88 [\fB\-\-strip\-trailing\-cr\fR]
89 [\fB\-\-supress\-common\-lines\fR]
91 [\fB\-\-to\-file=\fIFILE\fR]
92 [\fB\-\-unchanged\-group\-format=\fIFORMAT\fR]
93 [\fB\-\-unchanged\-line\-format=\fIFORMAT\fR]
94 [\fB\-\-unidirectional\-new\-file]
95 [\fB\-\-unified\fR[\fB=\fILINES\fR]]
96 [\fB\-\-width=\fICOLUMNS\fR]
100 [\fB\-v\fR] [\fB\-\-help\fR] [\fB\-\-version\fR]
104 ¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¡¢¤½¤ì¤é¤Î°ã¤¤¤òµ½Ò¤·¤Æ½ÐÎϤ¹¤ë¡£
106 ¤â¤Ã¤È¤â´Êñ¤Ê¾ì¹ç¤Ï¡¢Èæ³ÓÂоݤΥե¡¥¤¥ë¤Ï
110 ¤Ç¤¢¤ë¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¤Î¤É¤Á¤é¤«¤Ï
112 ¤È»ØÄꤷ¤Æ¤âÎɤ¤¡£¤³¤Î»þ¤Ï¤½¤Î¥Õ¥¡¥¤¥ë¤Ïɸ½àÆþÎϤ«¤éÆɤ߹þ¤Þ¤ì¤ë¡£
117 ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢
123 ¤Î¥Õ¥¡¥¤¥ë¤òÈæ³ÓÂоݤˤ¹¤ë (µÕ¤âƱÍÍ)¡£
124 ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¤Êý¤Î»ØÄê¤ò
126 ¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤¤Ê¤¤¡£
128 ξÊý¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Î¤È¤¤Ï¡¢
130 ¤ÏÁÐÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¡¢Âбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤ò
131 ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë¤½¤ì¤¾¤ìÈæ³Ó¤¹¤ë¡£
132 Èæ³Ó¤ÏºÆµ¢Åª¤Ë¤Ï¹Ô¤ï¤ì¤Ê¤¤¤¬¡¢
136 ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ì¤ÐºÆµ¢Åª¤Ë¤Ê¤ë¡£
138 ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤ½¤Î¤â¤Î¤ò¥Õ¥¡¥¤¥ë¤Î¤è¤¦¤ËÈæ³Ó¤¹¤ë¤³¤È¤Ï¤·¤Ê¤¤¡£
139 ¥Õ¥ë¥Ñ¥¹»ØÄê¤Î¥Õ¥¡¥¤¥ë¤Ï
141 ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¤Ê¤¼¤Ê¤éɸ½àÆþÎϤˤÏ̾Á°¤¬¤Ê¤¤¤Î¤Ç¡¢
142 ¡ÖƱ̾¤Î¥Õ¥¡¥¤¥ë¡×¤È¤¤¤¦³µÇ°¤¬»È¤¨¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£
144 .B \-\-from\-file=\fIFILE\fR
145 ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤ë¤È¡¢Ç¤°Õ¤Î¿ô¤Î¥Õ¥¡¥¤¥ë̾¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤¡¢
146 ¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Ï \fIFILE\fP ¤ÈÈæ³Ó¤µ¤ì¤ë¡£
148 .B \-\-to\-file=\fIFILE\fR
149 ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤ë¤È¡¢¤½¤ì¤¾¤ì»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï
150 \fIFILE\fP ¤ÈÈæ³Ó¤µ¤ì¤ë¡£
151 [ÌõÃí: 2.7 ¤Ë¤Ï¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¸ºß¤·¤Ê¤¤]
155 °Û¤Ê¤Ã¤Æ¤¤¤ëÉôʬ¤ÎÁ°¸å
157 ¹Ô (À°¿ô) ʬ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£
158 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï½ÐÎÏ·Á¼°¼«ÂΤλØÄê¤Ï¹Ô¤ï¤Ê¤¤¡£
161 ¥ª¥×¥·¥ç¥ó¤È°ì½ï¤ËÍѤ¤¤Ê¤¤¤È¡¢¤Ê¤ó¤Î¸ú²Ì¤â»ý¤¿¤Ê¤¤¡£
162 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï obsolete ¤Ç¤¢¤ë¡£
164 ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤Ë¤Ï¡¢¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¡£
167 ¥Õ¥¡¥¤¥ë¤¬¥Æ¥¥¹¥È¤Ë¤Ï¸«¤¨¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ç¤â¡¢
168 Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥¥¹¥È¤È¤ß¤Ê¤·¤Æ 1 ¹Ô¤º¤ÄÈæ³Ó¤ò¹Ô¤¦¡£
170 .B \-b, \-\-ignore\-space\-change
171 ¥¹¥Ú¡¼¥¹¤Î¿ô¤À¤±¤¬°ã¤¦¾ì¹ç¤Ë¤Ï°ã¤¤¤ò̵»ë¤¹¤ë¡£
172 ÉÔ´°Á´¤Ê¹Ô¤Ï̵»ë¤µ¤ì¤ë¡£
175 context ½ÐÎÏ·Á¼°¤òÍѤ¤¤ë¡£
178 ¥¢¥ë¥´¥ê¥º¥à¤òÊѹ¹¤·¡¢¤è¤ê¾®¤µ¤Êº¹Ê¬¤¬À¸À®¤Ç¤¤ë¤è¤¦¤Ë¤¹¤ë¡£
181 ¤ÏÃÙ¤¯¤Ê¤ë (Èó¾ï¤ËÃÙ¤¯¤Ê¤ë¾ì¹ç¤â¤¢¤ë)¡£
185 ¤Î¥¹¥¯¥ê¥×¥È·Á¼°¤Ç½ÐÎϤ¹¤ë¡£
187 .B \-f, \-\-forward\-ed
189 ¤Î¥¹¥¯¥ê¥×¥È¤È°ì¸«Æ±¤¸¤è¤¦¤Ê½ÐÎϤò¤¹¤ë¡£
190 ¤·¤«¤·½ÐÎϤ˸½¤ì¤ë½ç½ø¤¬°Û¤Ê¤ë [ÌõÃí: ¤·¤¿¤¬¤Ã¤Æ
195 ¸½ºß¤Ï²¿¤â¸ú²Ì¤ò»ý¤¿¤Ê¤¤¡£Unix ¤È¤Î¸ß´¹À¤Î¤¿¤á¤Ë¸ºß¤·¤Æ¤¤¤ë¡£
198 .B \-i, \-\-ignore\-case
199 ±ÑÂçʸ»ú¤È¾®Ê¸»ú¤Î°ã¤¤¤ò̵»ë¤¹¤ë¡£
204 ¤ËÄ̤·¤Æ¥Ú¡¼¥¸ÉÕ¤±¤ò¹Ô¤¦¡£
207 RCS ·Á¼°¤Î diff ¤ò½ÐÎϤ¹¤ë¡£
209 ¤È»÷¤Æ¤¤¤ë¤¬¡¢¤½¤ì¤¾¤ì¤Î¥³¥Þ¥ó¥É¤Ï½èÍý¤¹¤ë¹Ô¿ô¤ò»ØÄꤹ¤ë¡£
211 .B \-p, \-\-show\-c\-function
212 Êѹ¹¤¬¤É¤Î C ´Ø¿ô¤Ç¹Ô¤ï¤ì¤¿¤Î¤«¤òɽ¼¨¤¹¤ë¡£
217 ¥Õ¥¡¥¤¥ë¤¬°ã¤¦¤«¤É¤¦¤«¤À¤±¤òÊó¹ð¤¹¤ë¡£
218 °ã¤¤¤Î¾ÜºÙ¤ÏÊó¹ð¤·¤Ê¤¤¡£
220 .B \-r, \-\-recursive
221 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ë¤È¤¡¢
222 ¸«ÉÕ¤«¤Ã¤¿¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤ÆºÆµ¢Åª¤ËÈæ³Ó¤¹¤ë¡£
224 .B \-s, \-\-report\-identical\-files
225 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Æ±¤¸¤À¤Ã¤¿¤È¤¤âÊó¹ð¤¹¤ë¡£
227 .B \-t, \-\-expand\-tabs
228 ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ç¤Î¥¿¥Ö¤Ë¤è¤ë°ÌÃÖ¤¢¤ï¤»¤òÊݸ¤¹¤ë¤¿¤á¡¢
229 ½ÐÎϤΥ¿¥Ö¤ò¥¹¥Ú¡¼¥¹¤ËŸ³«¤¹¤ë¡£
232 unified ½ÐÎÏ·Á¼°¤òÍѤ¤¤ë¡£
234 .B \-w, \-\-ignore\-all\-space
235 ¹Ô¤òÈæ³Ó¤¹¤ë¤È¤¥¹¥Ú¡¼¥¹¤ò̵»ë¤¹¤ë¡£
236 ÉÔ´°Á´¤Ê¹Ô¤Ï̵»ë¤µ¤ì¤ë¡£
238 .BI "\-x " PATTERN ", \-\-exclude=" PATTERN
239 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ë¤È¤¡¢
240 ¥Õ¥¡¥¤¥ë̾¤Î base Éô¤¬
242 ¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤¹¤ë¡£
244 .B \-y, \-\-side\-by\-side
245 side-by-side ½ÐÎÏ·Á¼°¤òÍѤ¤¤ë¡£
247 .B \-B, \-\-ignore\-blank\-lines
248 ¶õ¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£
250 .BI "\-C " LINES ", \-\-context[=" LINES ]
251 context ½ÐÎÏ·Á¼°¤òÍѤ¤¡¢
253 ¹Ô (À°¿ôÃÍ) ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£
255 ¤¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð 3 ¹Ôɽ¼¨¤¹¤ë¡£
257 ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
258 ¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¤³¤È¤¬Â¿¤¤¡£
260 .BI "\-D " NAME ", \-\-ifdef=" NAME
261 if-then-else ·Á¼°¤Ç¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤò¹Ô¤¤¡¢
262 ¥×¥ê¥×¥í¥»¥Ã¥µ¤Î¾ò·ï¥Þ¥¯¥í¤Ë
266 .B "\-E, \-\-ignore\-tab\-expansion"
267 ¥¿¥ÖŸ³«¤Ë¤è¤ë¥¹¥Ú¡¼¥¹¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£
269 .BI "\-F " REGEXP ", \-\-show\-function\-line=" REGEXP
270 context ·Á¼°¤È unified ·Á¼°¤Ë¤ª¤¤¤Æ¡¢
271 ³Æº¹Ê¬ hunk (¥Æ¥¥¹¥È¥Ö¥í¥Ã¥¯) ¤ËÂФ·¡¢
274 ¤Ë¥Þ¥Ã¥Á¤·¤¿ºÇ¸å¤Î¹Ô¤Î°ìÉô¤òɽ¼¨¤¹¤ë¡£
276 .B \-H, \-\-speed\-large\-files
277 ¾®¤µ¤ÊÊѹ¹¤¬ÂçÎ̤ˤ¢¤ë¤è¤¦¤ÊÂ礤ʥե¡¥¤¥ë¤ò¹â®¤Ë°·¤¦¤¿¤á¤Ë¡¢
278 ¥Ò¥å¡¼¥ê¥¹¥Æ¥£¥Ã¥¯¤Ê¼êË¡¤òÍѤ¤¤ë¡£
279 û½Ì·Á¼° \-H ¤Ï¿ä¾©¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿¡£
281 .BI "\-I " REGEXP ", \-\-ignore\-matching\-lines=" REGEXP
283 ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤è¤¦¤Ê¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£
285 .BI "\-L " LABEL ", \-\-label=" LABEL
286 context ·Á¼°¤È unified ·Á¼°¤Î¥Ø¥Ã¥À¤Ë¡¢
290 û½Ì·Á¼° \-L ¤Ï¿ä¾©¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿¡£
292 .B \-N, \-\-new\-file
293 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢
294 ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ß¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤¿¤é¡¢
295 ¤â¤¦ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ÏƱ̾¤Î¶õ¤Ã¤Ý¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤è¤¦¤ËÆ°ºî¤¹¤ë¡£
297 .B \-P, \-\-unidirectional\-new\-file
298 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢
299 2 ÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤Ë¤Î¤ß¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤¿¤é¡¢
300 1 ÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤Ë¤ÏƱ̾¤Î¶õ¤Ã¤Ý¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤è¤¦¤ËÆ°ºî¤¹¤ë¡£
301 û½Ì·Á¼° \-P ¤Ï¿ä¾©¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿¡£
303 .BI "\-S " FILE ", \-\-starting\-file=" FILE
304 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢
306 ¤«¤é»Ï¤á¤ë¡£ÃæÃǤ·¤¿Èæ³Ó¤ò³¹Ô¤¹¤ëºÝ¤ËÍøÍѤǤ¤ë¡£
308 .B \-T, \-\-initial\-tab
309 normal ·Á¼°¤ä context ·Á¼°¤Ç¡¢¥Æ¥¥¹¥È¤ÎÁ°¤Ë¥¹¥Ú¡¼¥¹¤Ç¤Ê¤¯¥¿¥Ö¤ò½ÐÎϤ¹¤ë¡£
310 ¤³¤¦¤¹¤ë¤È¹ÔÃæ¤Ç¤Î¥¿¥Ö¤Ë¤è¤ë·å·¤¨¤¬ÉáÄ̤˸«¤¨¤ë¡£
312 .BI "\-U " LINES ", \-\-unified" \fR[ = LINES \fR]
313 unified ½ÐÎÏ·Á¼°¤òÍѤ¤¡¢
315 ¹Ô (À°¿ôÃÍ) ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£
317 ¤¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð 3 ¹Ôɽ¼¨¤¹¤ë¡£
319 ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
320 ¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¤³¤È¤¬Â¿¤¤¡£
322 .BI "\-W " COLUMNS ", \-\-width=" COLUMNS
323 side-by-side ·Á¼°¤Ç¡¢½ÐÎϤÎÉý¤ò
327 .BI \-X FILE ", \-\-exclude\-from=" FILE
328 ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢
329 ¥Õ¥¡¥¤¥ë̾¤Î base Éô¤¬
331 ¤Î¥Ñ¥¿¡¼¥ó¤Î¤¤¤º¤ì¤«¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤¹¤ë¡£
334 ¥Ç¡¼¥¿¤ò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ÇÆɤ߽ñ¤¤¹¤ë
335 (Linux ¤ä¤½¤Î¾¤Î POSIX ¥Û¥¹¥È¤Ç¤Ï°ÕÌ£¤Ê¤·)¡£
337 .BI \-\-changed\-group\-format= FORMAT
338 if-then-else ·Á¼°¤Ç¡¢
339 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ç°Û¤Ê¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎϤË
343 .B \-\-diff\-program= \fIPROGRAM
344 ¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤¹¤ë¤¿¤á¤Ë \fBdiff\fR ¤È¸ß´¹À¤Î¤¢¤ë
345 ³°Éô¥×¥í¥°¥é¥à \fIPROGRAM\fR ¤òÍѤ¤¤ë¡£
347 .BI \-\-from\-file= FILE
349 ¤ò³Æ¥ª¥Ú¥é¥ó¥É¤ÈÈæ³Ó¤¹¤ë (\fIFILE\fR ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤âÎɤ¤)¡£
350 [ÌõÃí: 2.7 ¤Ë¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¸ºß¤·¤Ê¤¤]
352 .BI \-\-horizon\-lines= LINES
353 º¹Ê¬¤ò¤â¤Ã¤È¤â¥³¥ó¥Ñ¥¯¥È¤Ë½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¢
354 °ã¤¦Éôʬ¤ÎÁ°¸å¤Ë¤¢¤ë¶¦ÄÌÉôʬ¤Î¤½¤ì¤¾¤ì
356 ¹Ô¤ò¼Î¤Æ¤º¤ËÊݸ¤¹¤ë¡£
358 .B \-\-ignore\-file\-name\-case
359 ¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤¹¤ëºÝ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÂçʸ»ú¾®Ê¸»ú¤ò̵»ë¤¹¤ë¡£
360 ¤½¤Î¤¿¤á ``foo'' ¤È ``Foo'' ¤ÏƱ¤¸¤È¤µ¤ì¤ë¤Î¤Ç¡¢¸ß¤¤¤ËÈæ³Ó¤µ¤ì¤ë¡£
362 .B \-\-inhibit\-hunk\-merge
363 ÎÙÀܤ¹¤ë hunk ¤Î¶³¦¤ò°ÜÆ°¤·¤Æ hunk ¤ò¥Þ¡¼¥¸¤¹¤ëÆ°ºî¤ò¹Ô¤ï¤Ê¤¤¡£
366 side-by-side ·Á¼°¤Ç¡¢¶¦Ä̤ʹԤϺ¸Â¦¤ÎÎó¤Ë¤·¤«É½¼¨¤·¤Ê¤¤¡£
368 .BI \-\-line\-format= FORMAT
369 if-then-else ·Á¼°¤Ç¡¢Á´¤Æ¤ÎÆþÎϹԤνÐÎϤË
373 .BI \-\-new\-group\-format= FORMAT
374 if-then-else ·Á¼°¤Ç¡¢
375 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎϤË
379 .BI \-\-new\-line\-format= FORMAT
380 if-then-else ·Á¼°¤Ç¡¢
381 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤Î½ÐÎϤË
385 .B \-\-no\-ignore\-file\-name\-case
386 ¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤¹¤ëºÝ¤Ë¡¢¥Õ¥¡¥¤¥ë̾¤ÎÂçʸ»ú¾®Ê¸»ú¤ò¹Íθ¤¹¤ë¡£
387 ¤½¤Î¤¿¤á ``foo'' ¤È ``Foo'' ¤ÏƱ¤¸¤â¤Î¤È¤µ¤ì¤Ê¤¤¡£
388 \fB\-\-ignore\-file\-name\-case\fR ¤ò»²¾È¤¹¤ë¤³¤È¡£
390 .BI \-\-old\-group\-format= FORMAT
391 if-then-else ·Á¼°¤Ç¡¢
392 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎϤË
396 .BI \-\-old\-line\-format= FORMAT
397 if-then-else ·Á¼°¤Ç¡¢
398 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤Î½ÐÎϤË
402 .B \-\-sdiff\-merge\-assist
404 ÍѤËÄɲþðÊó¤òɽ¼¨¤¹¤ë¡£
408 ¤ò¼Â¹Ô¤¹¤ë¤È¤¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¡£
409 Ä̾ï¤Î¥æ¡¼¥¶¡¼¤¬¤³¤Î¥ª¥×¥·¥ç¥ó¤òľÀÜ»ØÄꤹ¤ë¾ì¹ç¤Ï¤¢¤Þ¤êÁÛÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£
411 .B \-\-strip\-trailing\-cr
412 ¹ÔËö¤Î CR ¤ò¼è¤ê½ü¤¯¡£
413 ¹ÔËö¤Î¥Þ¡¼¥«¤È¤·¤Æ CRLF ¤ò»È¤¦¥·¥¹¥Æ¥à¤Î½ÐÎϤò½èÍý¤¹¤ë¤È¤¤ËÌòΩ¤Ä¡£
415 .B \-\-suppress\-common\-lines
416 side-by-side ·Á¼°¤Ç¶¦Ä̤ʹԤòɽ¼¨¤·¤Ê¤¤¡£
418 .BI \-\-unchanged\-group\-format= FORMAT
419 if-then-else ·Á¼°¤Ç¡¢
420 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԥ°¥ë¡¼¥×¤Î½ÐÎϤË
424 .BI \-\-unchanged\-line\-format= FORMAT
425 if-then-else ·Á¼°¤Ç¡¢
426 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԤνÐÎϤË
431 ɸ½à½ÐÎϤ˻ÈÍÑÊýË¡¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤ÆÀµ¾ï½ªÎ»¤¹¤ë¡£
435 ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ¹¤ë¡£
437 .\"nakano: normal format ¤¬¤Ê¤¤...
439 context ½ÐÎÏ·Á¼°¤Ï 2 ¹Ô¤Î¥Ø¥Ã¥À¤«¤é¤Ï¤¸¤Þ¤ë¡£
440 ¤³¤ì¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:
443 *** FROMFILE FROMFILE-MODIFICATION-TIME
444 --- TOFILE TOFILE-MODIFICATION-TIME
448 ¤òÍѤ¤¤ë¤È¥Ø¥Ã¥À¤ÎÆâÍƤÏÊѲ½¤¹¤ë¡£
449 ¼¡¤ËÍè¤ë¤Î¤Ï hunk (¥Æ¥¥¹¥È¥Ö¥í¥Ã¥¯) ¤Ç¤¢¤ë¡£
450 ·«¤êÊÖ¤·Åо줹¤ë¤³¤È¤â¤¢¤ë¡£
451 context ·Á¼°¤Î hunk ¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:
455 *** FROMFILE-LINE-RANGE ****
458 --- TOFILE-LINE-RANGE ----
463 °Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Î¼þÊդΥ³¥ó¥Æ¥¯¥¹¥È¤Î³Æ¹Ô¤Ë¤Ï¡¢
464 ÀèƬ¤Ë 2 ¤Ä¤Î¥¹¥Ú¡¼¥¹¤¬¤Ä¤¤¤Æ¤¤¤ë¡£
465 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Ç°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Ë¤Ï¡¢
466 ÀèƬ¤Ëɽ¼¨Ê¸»ú¤È¥¹¥Ú¡¼¥¹¤¬¤Ä¤¯¡£
469 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤ÇÊѹ¹¤µ¤ì¤¿Éôʬ¤Î³Æ¹Ô¡£
470 ¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤ÎÂбþ¤¹¤ëÉôʬ¤â
472 ¤Ç¥Þ¡¼¥¯¤µ¤ì¤Æɽ¼¨¤µ¤ì¤ë¡£
475 2 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¡ÖÁÞÆþ¤µ¤ì¤¿¡×¹Ô¡£1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤ËÂбþÉôʬ¤Ï¤Ê¤¤¡£
478 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¡Öºï½ü¤µ¤ì¤¿¡×¹Ô¡£2 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤ËÂбþÉôʬ¤Ï¤Ê¤¤¡£
480 hunk ¤ÎÁ´¤Æ¤ÎÊѹ¹¤¬ÁÞÆþ¤Ç¤¢¤ì¤Ð¡¢
482 ³Æ¹Ô¤Ï¾Êά¤µ¤ì¤ë¡£¤Þ¤¿Á´¤Æ¤ÎÊѹ¹¤¬ºï½ü¤Ç¤¢¤ì¤Ð¡¢
488 --- FROMFILE FROMFILE-MODIFICATION-TIME
489 +++ TOFILE TOFILE-MODIFICATION-TIME
493 ¤òÍѤ¤¤ë¤È¥Ø¥Ã¥À¤ÎÆâÍƤÏÊѲ½¤¹¤ë¡£
494 ¼¡¤ËÍè¤ë¤Î¤Ï hunk (¥Æ¥¥¹¥È¥Ö¥í¥Ã¥¯) ¤Ç¤¢¤ë¡£·«¤êÊÖ¤·Åо줹¤ë¤³¤È¤â¤¢¤ë¡£
495 ¤½¤ì¤¾¤ì¤Î hunk ¤Ï¥Õ¥¡¥¤¥ë¤Î°Û¤Ê¤Ã¤Æ¤¤¤ë 1 ¤Ä 1 ¤Ä¤ÎÉôʬ¤ò¼¨¤·¤Æ¤¤¤ë¡£
496 unified ·Á¼°¤Î hunk ¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:
499 @@ FROMFILE-RANGE TOFILE-RANGE @@
500 LINE-FROM-EITHER-FILE
501 LINE-FROM-EITHER-FILE...
504 ξ¼Ô¤Ç¶¦Ä̤ʹԤÎÁ°¤Ë¤Ï 1 ¤Ä¤Î¥¹¥Ú¡¼¥¹¤¬ÃÖ¤«¤ì¤ë¡£
505 °Û¤Ê¤ë¹Ô¤ÎÁ°¤Ë¤Ï°Ê²¼¤Îɽ¼¨Ê¸»ú¤¬ÃÖ¤«¤ì¤ë:
508 ¤³¤³¤Ç 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ë¹Ô¤ÎÄɲ䬹Ԥï¤ì¤¿¡£
511 ¤³¤³¤Ç 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤«¤é¹Ô¤Îºï½ü¤¬¹Ô¤ï¤ì¤¿¡£
512 .SS side-by-side ·Á¼°
513 ¥Õ¥¡¥¤¥ë¤Ï 2 Îó¤Ëɽ¼¨¤µ¤ì¡¢´Ö¤Ë¹Â (gutter) ¤¬ÃÖ¤«¤ì¤ë¡£
514 ¹Â¤Ë¤Ï°Ê²¼¤Î¥Þ¡¼¥«¡¼¤Î¤¤¤º¤ì¤« 1 ¤Ä¤¬´Þ¤Þ¤ì¤ë¡£
517 Âбþ¤¹¤ë¹Ô¤¬¶¦Ä̤Ǥ¢¤ë¡£¤Ä¤Þ¤ê¡¢Î¾Êý¤Î¹Ô¤¬Æ±°ì¤Ç¤¢¤ë¤«¡¢
520 ¥ª¥×¥·¥ç¥ó¤Î¤¤¤º¤ì¤«¤Ë¤è¤Ã¤Æ̵»ë¤µ¤ì¤¿¡£
523 Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£Î¾Êý¤È¤â´°Á´¤«¡¢Î¾Êý¤È¤âÉÔ´°Á´¤«¤Ç¤¢¤ë¡£
526 ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ê¡¢1 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£
529 ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ê¡¢2 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£
532 1 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤¬¡¢°ã¤¤¤Ï̵»ë¤µ¤ì¤ë¡£
535 2 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤¬¡¢°ã¤¤¤Ï̵»ë¤µ¤ì¤ë¡£
538 Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£1 ÈÖÌܤιԤÀ¤±¤Ë¹ÔËö¤Î²þ¹Ô¤¬¤Ê¤¤¡£
541 Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£2 ÈÖÌܤιԤÀ¤±¤Ë¹ÔËö¤Î²þ¹Ô¤¬¤Ê¤¤¡£
542 Ä̾ï½ÐÎϹԤϡ¢¤½¤³¤Ë´Þ¤Þ¤ì¤ë¹Ô¤ÎËöÈø¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¸Â¤Ã¤Æ²þ¹Ô¤µ¤ì¤Ê¤¤¡£
543 ¤·¤«¤·¡¢½ÐÎϹԤ¬ 2 ¹Ô¤Îº¹°Û¤òɽ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
544 ÊÒÊý¤À¤±¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤â¤¢¤êÆÀ¤ë¡£¤³¤Î¾ì¹ç½ÐÎϹԤˤϲþ¹Ô¤¬½ÐÎϤµ¤ì¤ë¤¬¡¢
545 ¹Â¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
547 ¤Ë¡¢2 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
551 side-by-side ·Á¼°¤¬°ìÈÖÆɤߤ䤹¤¤¤è¤¦¤Ê¾ì¹ç¤â¤¢¤ë¤¬¡¢¸Â³¦¤â¤¢¤ë¡£
552 ¤³¤Î·Á¼°¤ÏÄ̾ï¤è¤ê¤â¤º¤Ã¤È¹¤¤Éý¤Î½ÐÎϤòÀ¸À®¤·¡¢
553 Ť¹¤®¤ë¹Ô¤ÏÀÞ¤ê¾ö¤ó¤Ç¤·¤Þ¤¦¡£
554 ¤Þ¤¿¤³¤Î½ÐÎϤǤÏÄ̾ï¤è¤ê¤âʸ»ú¤ÎÀ°Îó¤Ø¤Î°Í¸¤¬Â礤¯¤Ê¤ë¤Î¤Ç¡¢
555 ÅùÉý¥Õ¥©¥ó¥È¤ò»È¤Ã¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢Ä̾ï¤È°Û¤Ê¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤ò»È¤Ã¤Æ¤¤¤¿¤ê¡¢
556 °õ»ú¤µ¤ì¤Ê¤¤Ê¸»ú¤ò»È¤Ã¤Æ¤¤¤¿¤ê¤¹¤ë¤È¡¢½ÐÎϤ¬Èó¾ï¤Ë½¹¤¯¤Ê¤ë¡£
558 1 ¤Ä°Ê¾å¤Îº¹Ê¬ hunk ¤«¤é¹½À®¤µ¤ì¤ë¡£
559 ËöÈø¤Ë¶á¤¤Êý¤ÎÊѹ¹¤¬Àè¤Ë¸½¤ì¡¢¹Ô¿ô¤ÎÊѲ½¤¬°Ê¹ß¤Î
561 ¤Î¹ÔÈÖ¹æ²ò¼á¤Ë±Æ¶Á¤·¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡£
563 ·Á¼°¤Î hunk ¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:
573 ¤ÏÆþÎϤÎËöÈø¤òɽ¤¹¤¿¤á¤Ë¥Ô¥ê¥ª¥É 1 ¤Ä¤À¤±¤Î¹Ô¤òÍѤ¤¤ë¤Î¤Ç¡¢
575 ¤ÏÊѹ¹¤µ¤ì¤¿¹Ô¤Î¤¦¤Á¡¢¥Ô¥ê¥ª¥É 1 ¤Ä¤À¤±¤Î¹Ô¤ò
576 ¥Ô¥ê¥ª¥É 2 ¤Ä¤ËÊѹ¹¤·¤Æ¥×¥í¥Æ¥¯¥È¤·¡¢
577 ³¤±¤Æ 2 ¤Ä¤Î¥Ô¥ê¥ª¥É¤ò 1 ¤Ä¤Ë¤¹¤ë ed ¥³¥Þ¥ó¥É¤ò½ñ¤¯¡£
579 ·Á¼°¤Ï²þ¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤òɽ¤¹¤³¤È¤¬¤Ç¤¤Ê¤¤¡£
580 ¤·¤¿¤¬¤Ã¤Æ 2 ÈÖÌܤΥե¡¥¤¥ë¤ÎºÇ½ª¹Ô¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Æ¡¢
581 ¤«¤Ä²þ¹Ô¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
583 ¤Ï¥¨¥é¡¼¤òÊó¹ð¤·¤Æ¡¢²þ¹Ô¤¬¤¢¤ë¤«¤Î¤è¤¦¤ËÆ°ºî¤¹¤ë¡£
585 Êѹ¹¥³¥Þ¥ó¥É¤Ë¤Ï 3 ¤Ä¤Î¼ïÎब¤¢¤ë¡£
586 ¤½¤ì¤¾¤ì¡¢1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÖ¹æ (¤Þ¤¿¤Ï¥³¥ó¥Þ¶èÀÚ¤ê»ØÄê¤Î¹ÔÈÏ°Ï»ØÄê)¡¢
587 ³¤±¤ÆÊѹ¹¤Î¼ïÎà¤ò¼¨¤¹ 1 ʸ»ú¤Îʸ»ú¤«¤é¤Ê¤ë¡£
588 ¹ÔÈÖ¹æ¤Ï¡¢¤¹¤Ù¤Æ¥Õ¥¡¥¤¥ë¤Î¥ª¥ê¥¸¥Ê¥ë¤Î¹ÔÈÖ¹æ¤Ç¤¢¤ë¡£
589 Êѹ¹¥³¥Þ¥ó¥É¤Î¼ïÎà¤Ï°Ê²¼¤ÎÄ̤ê:
592 1 ÈÖÌܤΥե¡¥¤¥ë¤Î \fIL\fP ¹ÔÌܰʹߤˡ¢2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¥Æ¥¥¹¥È¤òÄɲ乤롣
593 Î㤨¤Ð `8a' ¤Ï¡¢°Ê¹ß¤Î¹Ô¤ò¥Õ¥¡¥¤¥ë 1 ¤Î 8 ¹ÔÌܰʹߤËÄɲ乤롣
596 1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÏ°Ï \fIR\fP ¤ò¡¢
597 °ú¤Â³¤¯¹Ô¤ÇÃÖ¤´¹¤¨¤ë¡£ÄɲäȺï½ü¤ÎÁȤ߹ç¤ï¤»¤Ç¤âƱ¤¸¤³¤È¤¬¤Ç¤¤ë¤¬¡¢
598 ¤³¤Á¤é¤Î¤Û¤¦¤¬¥³¥ó¥Ñ¥¯¥È¤Ç¤¢¤ë¡£Î㤨¤Ð `5,7c' ¤Ï¥Õ¥¡¥¤¥ë 1 ¤Î
599 5 ¹ÔÌܤ«¤é 7 ¹ÔÌܤò¥Õ¥¡¥¤¥ë 2 ¤«¤éÆɤ߹þ¤ó¤ÀÆâÍƤÇÃÖ¤´¹¤¨¤ë¡£
600 .\"nakano: ¤Á¤ç¤Ã¤È to read as.. ¤ÎÌõ¤È¤·¤ÆÊѤ«¤â¡£
603 1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÏ°Ï \fIR\fP ¤òºï½ü¤¹¤ë¡£
604 Î㤨¤Ð `5,7d' ¤Ï¥Õ¥¡¥¤¥ë 1 ¤Î 5 ¹ÔÌܤ«¤é 7 ¹ÔÌܤޤǤòºï½ü¤¹¤ë¡£
609 ¥¹¥¯¥ê¥×¥È¤Î¤è¤¦¤Ê½ÐÎϤǡ¢¤«¤Ä³Æ hunk ¤¬ forward Êý¸þ (ÀèƬ¤«¤éËöÈø¤Ø)
610 ¤Î¤è¤¦¤Ê½ÐÎϤâÀ¸À®¤Ç¤¤ë¡£¥³¥Þ¥ó¥É¤Î·Á¼°¤â¤Á¤ç¤Ã¤ÈÊѲ½¤·¤Æ¤¤¤ë¡£
611 ¥³¥Þ¥ó¥Éʸ»ú¤¬¡¢½¤Àµ¤¹¤ë¹Ô¤ä¹ÔÈϰϤÎÀè¤ËÍè¤ë¤Î¤Ç¤¢¤ë¡£
612 ¤Þ¤¿¡¢¥Ô¥ê¥ª¥É 1 ¤Ä¤À¤±¤Î¹Ô¤òÆÃÊÌ°·¤¤¤¹¤ë¤³¤È¤â¤·¤Ê¤¤¡£
613 .\"nakano: °ÕÌõ¤·¤¹¤®¤À¤í¤¦¤«(^^;
615 ·Á¼°¤ÈƱÍͤˡ¢forward
617 ·Á¼°¤â²þ¹Ô¤·¤Æ¤¤¤Ê¤¤¹Ô¤òɽ¤¹¤³¤È¤Ï¤Ç¤¤Ê¤¤¡£
621 ·Á¼°¤Ï¤¢¤Þ¤êÊØÍø¤Ç¤Ï¤Ê¤¤¡£¤Ê¤¼¤Ê¤é
625 ¤â¤³¤Î·Á¼°¤Î diff ¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£
626 ¤³¤ì¤Ï¼ç¤Ë¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î
628 ¤È¤Î¸ß´¹À¤Î¤¿¤á¤Ë¸ºß¤·¤Æ¤¤¤ë¡£
630 RCS ½ÐÎÏ·Á¼°¤Ï Revision Control System (RCS)
631 ¤ÇÍѤ¤¤ë¤¿¤á¤ËÆÃÊ̤ËÀ߷פµ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¡£
632 RCS ¤Ï¥Ð¡¼¥¸¥ç¥ó¤ä¥·¥¹¥Æ¥à¤Î°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¤ò°·¤¦¤¿¤á¤Î¡¢
633 ¥Õ¥ê¡¼¤Ê¥×¥í¥°¥é¥à¥»¥Ã¥È¤Ç¤¢¤ë¡£
637 ¥Ô¥ê¥ª¥É 1 ¤Ä¤Î¹Ô¤ä²þ¹Ô¤·¤Æ¤¤¤Ê¤¤¹Ô¤ÎÌäÂê¤ò²óÈò¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
638 ¥Õ¥¡¥¤¥ëÆâÍƤÎǤ°Õ¤ÎÊѹ¹¤òɽ¤¹¤³¤È¤¬¤Ç¤¤ë¡£
639 ¥Æ¥¥¹¥È¥»¥¯¥·¥ç¥ó¤ò¥Ô¥ê¥ª¥É 1 ¤Ä¤Î¹Ô¤Ç½ª¤ï¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
640 ¤½¤ì¤¾¤ì¤Î¥³¥Þ¥ó¥É¤Ç¡¢Å¬ÍѤ¹¤ë¹Ô¿ô¤ò»ØÄꤷ¤Æ¤¤¤ë¤Î¤Ç¤¢¤ë¡£¤Þ¤¿
644 ¤ÎÁȤ߹ç¤ï¤»¤òÍѤ¤¤Æ¤¤¤ë¡£
645 ¤µ¤é¤Ë 2 ÈÖÌܤΥե¡¥¤¥ë¤ÎËöÈø¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Æ¡¢
646 ¤«¤Ä²þ¹Ô¤Ç½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
647 ½ÐÎϤÎËöÈø¤â²þ¹Ô¤µ¤ì¤Ê¤¤¾õÂ֤ǽª¤ï¤ë¡£
651 ¤òÍѤ¤¤Æ 2 ¥Õ¥¡¥¤¥ë¤Î C ¥½¡¼¥¹¥³¡¼¥É¤ò¥Þ¡¼¥¸¤¹¤ë¤³¤È¤â¤Ç¤¤ë¡£
652 ¤³¤Î½ÐÎÏ·Á¼°¤Ë¤Ï¡¢Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤Î¹Ô¤¬¤¹¤Ù¤Æ´Þ¤Þ¤ì¤ë¡£
653 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԤϰìÅÙ¤·¤«Åо줷¤Ê¤¤¡£
654 °Û¤Ê¤ëÉôʬ¤Ï C ¥×¥ê¥×¥í¥»¥Ã¥µ¤Î»ØÄê¤òÍѤ¤¤ÆʬΥ¤µ¤ì¤ë¡£
659 ,BR #else ", and " #endif
661 ½ÐÎϤò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤¡¢¥Þ¥¯¥í
663 ¤òÄêµÁ¤·¤¿¤ê¡¢Ì¤ÄêµÁ¤Î¤Þ¤Þ¤Ë¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
664 ¤É¤Á¤é¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»È¤¦¤«¤òÁªÂò¤Ç¤¤ë¡£
666 Î㤨¤Ð¡¢`wait (&s)' ¤È¤¤¤¦¥¤¥ó¥¹¥¿¥ó¥¹¤ò `waitpid (-1, &s, 0)'
667 ¤ËÊѹ¹¤·¡¢¿·µì¤Î¥Õ¥¡¥¤¥ë¤ò
668 `\fB--ifdef=\fIHAVE_WAITPID\fR' ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¥Þ¡¼¥¸¤¹¤ë¤È¡¢
669 ±Æ¶Á¤ò¼õ¤±¤¿Éôʬ¤Î¥³¡¼¥É¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ë¤À¤í¤¦:
674 if ((w = wait (&s)) < 0 && errno != EINTR)
675 #else /* HAVE_WAITPID */
676 if ((w = waitpid (-1, &s, 0)) < 0 && errno != EINTR)
677 #endif /* HAVE_WAITPID */
679 } while (w != child);
681 .\"nakano: "Line group formats" ¤Î´Ö°ã¤¤¤À¤í¤¦.
683 ¹Ô¥°¥ë¡¼¥×·Á¼°¤òÍѤ¤¤ë¤È¡¢
684 if-then-else ÆþÎϤò¼õ¤±Æþ¤ì¤ë¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËŬ¤·¤¿·Á¼°¤ò»ØÄê¤Ç¤¤ë¡£
685 Î㤨¤Ð¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤äʸ½ñÀ°·Á¸À¸ì¤Ê¤É¤¬µó¤²¤é¤ì¤ë¡£
687 »÷¤Æ¤¤¤ë¹Ô¤«¤é¤Ê¤ëÎÙÀܤ·¤¿¥°¥ë¡¼¥×¤Î½ÐÎÏ·Á¼°¤ò»ØÄꤹ¤ë¡£
689 Î㤨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï TeX ¥Õ¥¡¥¤¥ë `old' ¤È `new' ¤òÈæ³Ó¤·¡¢
690 old ¤ÎÉôʬ¤ò `\ebegin{em}'-`\eend{em}' ¤Ç°Ï¤ß¡¢
691 new ¤ÎÉôʬ¤ò `\ebegin{bf}'-`\eend{bf}' ¤Ç°Ï¤ó¤Ç¥Þ¡¼¥¸¤·¤¿¤«¤¿¤Á¤Ç½ÐÎϤ¹¤ë¡£
695 --old-group-format='\ebegin{em}
698 --new-group-format='\ebegin{bf}
704 °Ê²¼¤Î¥³¥Þ¥ó¥É¤â¾åµ¤ÎÎã¤ÈƱ¤¸¤À¤¬¡¢¤ä¤äµ½Ò¤¬Â¿¤¤¡£
705 ¥Ç¥Õ¥©¥ë¥È¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤â»ØÄꤷ¤Æ¤¤¤ë¤«¤é¤Ç¤¢¤ë¡£
709 --old-group-format='\ebegin{em}
712 --new-group-format='\ebegin{bf}
715 --unchanged-group-format='%=' \e
716 --changed-group-format='\ebegin{em}
724 ¼¡¤Ë¤â¤¦¾¯¤·¿Ê¤ó¤ÀÎã¤ò¾Ò²ð¤¹¤ë¡£¤³¤ì¤Ïº¹Ê¬¥ê¥¹¥È¤ò¡¢
725 "plain English" ¥¹¥¿¥¤¥ë¤Ç¹ÔÈÖ¹æ¤ò½ñ¤¤¤¿¥Ø¥Ã¥À¤È¤È¤â¤Ë½ÐÎϤ¹¤ë¡£
729 --unchanged-group-format='' \e
730 --old-group-format='-------- %dn line%(n=1?:s) deleted at %df:
732 --new-group-format='-------- %dN line%(N=1?:s) added after %de:
734 --changed-group-format='-------- %dn line%(n=1?:s) changed at %df:
740 ¹Ô¥°¥ë¡¼¥×·Á¼°¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
742 ¤ò°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤« 1 ¤Ä¤ò»ØÄꤷ¤Æ¼Â¹Ô¤¹¤ë¡£
743 4 ¤Ä¤Þ¤Ç¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤ò»ØÄê¤Ç¤¡¢
744 ³Æ»ØÄ꤬¤½¤ì¤¾¤ì¹Ô¥°¥ë¡¼¥× 1 ¤Ä¤ËÂбþ¤¹¤ë¡£
746 ¤Ë¤Ï¥·¥§¥ë¤Î¥á¥¿¥¥ã¥é¥¯¥¿¤¬Æþ¤Ã¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢
747 ¥¯¥©¡¼¥È¤¹¤ë¤Ù¤¤Ç¤¢¤í¤¦¡£
749 .BI \-\-old-group\-format= FORMAT
750 ¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤Ï 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£
751 ¥Ç¥Õ¥©¥ë¥È¤Î old ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢changed ¥°¥ë¡¼¥×·Á¼°¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð
752 ¤½¤ì¤ÈƱ¤¸¤Ë¤Ê¤ë¡£¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¹Ô¥°¥ë¡¼¥×¤Ï¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤµ¤ì¤ë¡£
754 .BI \-\-new-group\-format= FORMAT
755 ¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤Ï 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£
756 ¥Ç¥Õ¥©¥ë¥È¤Î new ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢changed ¥°¥ë¡¼¥×·Á¼°¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð
757 ¤½¤ì¤ÈƱ¤¸¤Ë¤Ê¤ë¡£¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¹Ô¥°¥ë¡¼¥×¤Ï¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤµ¤ì¤ë¡£
759 .BI \-\-changed\-group\-format= FORMAT
760 ¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤ÏξÊý¤Î¥Õ¥¡¥¤¥ë¤Î¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£
761 ¥Ç¥Õ¥©¥ë¥È¤Î changed ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢
762 old ¥°¥ë¡¼¥×¤È new ¥°¥ë¡¼¥×¤Î·Á¼°¤òÏ¢·ë¤·¤¿¤â¤Î¤Ç¤¢¤ë¡£
764 .BI \-\-unchanged\-group\-format= FORMAT
765 ¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤ÏξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ιԤ«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£
766 ¥Ç¥Õ¥©¥ë¥È¤Î unchanged ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢
767 ¹Ô¥°¥ë¡¼¥×¤ò¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤ¹¤ë¤â¤Î¤Ç¤¢¤ë¡£
771 1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤ò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£
772 ³Æ¹Ô¤Ï old ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£
775 2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤ò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£
776 ³Æ¹Ô¤Ï new ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£
779 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ç¶¦Ä̤ʹԤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£
780 ³Æ¹Ô¤Ï unchanged ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£
788 ¤Ïʸ»ú 1 ʸ»ú¤Ç¡¢\fIC\fR ¤òɽ¤¹¡£
790 ¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ä¥¢¥Ý¥¹¥È¥í¥Õ¥£¤Ï»ØÄê¤Ç¤¤Ê¤¤¡£
791 Î㤨¤Ð `%c':'' ¤Ï¥³¥í¥ó¤òɽ¤·¡¢¤³¤ì¤Ï if-then-else ·Á¼°¤Î
792 then Éôʬ¤Ç¤â¥³¥í¥ó¤È¤·¤Æ²ò¼á¤µ¤ì¤ë¡£Ä̾ï¤Ï¥³¥í¥ó¤Ï
793 then Éôʬ¤Î½ª¤ï¤ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£
798 ¤Ï 1 ·å¤«¤é 3 ·å¤Þ¤Ç¤Î 8 ¿Ê¿ô»ú¤Ç¤¢¤ê¡¢8 ¿Ê¤Î¥³¡¼¥É
800 ¤ËÂбþ¤¹¤ëʸ»ú¤òɽ¤¹¡£Î㤨¤Ð `%c'\e0'' ¤Ï¥Ê¥ëʸ»ú¤Ë¤Ê¤ë¡£
802 .BI ( A = B ? T : E )
809 ¤Ï¤½¤ì¤¾¤ì 10 ¿Ê¿ô¤ÎÄê¿ô¤«¡¢¾åµ¤Î¤è¤¦¤Ë²ò¼á¤µ¤ì¤ëʸ»ú 1 ¤Ä¤Ç¤¢¤ë¡£
811 .IR A " ¤ÎÃͤ¬ " B " ¤ÈÅù¤·¤±¤ì¤Ð " T " ¤ÈÅù²Á¤Ç¤¢¤ê¡¢
816 Î㤨¤Ð `%(N=0?no:%dN) line%(N=1?:s)' ¤Ï
817 N (new ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô) ¤¬ 0 ¤Ê¤é `no lines' ¤È¤Ê¤ê¡¢
818 N ¤¬ 1 ¤Ê¤é `1 line' ¤È¤Ê¤ê¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï `%dN lines' ¤È¤Ê¤ë¡£
827 ¤Ï°Ê²¼¤Îʸ»ú¤Î¤É¤ì¤«¤Ç¤¢¤ë¡£
828 .RI ¡Ö F " ¤ÇÀ°·Á¤µ¤ì¤¿ " N " ¤ÎÃÍ¡×
834 old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎľÁ°¤Î¹Ô¤Î¹ÔÈֹ档
837 old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎºÇ½é¤Î¹ÔÈֹ档e + 1 ¤ËÅù¤·¤¤¡£
840 old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎËöÈø¤Î¹ÔÈֹ档
843 old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Îľ¸å¤Î¹Ô¤Î¹ÔÈֹ档l + 1 ¤ËÅù¤·¤¤¡£
846 old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô¡£l - f + 1 ¤ËÅù¤·¤¤¡£
849 ¾åµ¤ÈƱÍͤΠnew ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¤â¤Î¡£
854 .BR %d ", " %o ", " %x ", " %X
855 (¤½¤ì¤¾¤ì 10 ¿Ê, 8 ¿Ê, ¾®Ê¸»ú 16 ¿Ê, Âçʸ»ú 16 ¿Ê) ¤¬»È¤¨¤ë¡£
857 ¤Î¸å¤Ë¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ò½ç¤Ë»ØÄê¤Ç¤¤ë¡£
859 (º¸µÍ¤á¤Î»ØÄê)¡¢À°¿ô (¥Õ¥£¡¼¥ë¥É¤ÎºÇÄãÉý)¡¢
860 ¥Ô¥ê¥ª¥É¤È¿ôÃÍ (¿ôÃͤϾÊά²Ä; ·å¿ô¤ÎºÇ¾®ÃÍ) ¤Ç¤¢¤ë¡£
861 Î㤨¤Ð `%5dN' ¤Ï new ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô¤ò¡¢
862 5 ʸ»úÉý¤Î¥Õ¥£¡¼¥ë¥É¤Ë¡¢
864 ¤Î "%5d" ½ñ¼°¤òÍѤ¤¤Æɽ¼¨¤¹¤ë¡£
865 .\"nakano: "Line format" ¤Î´Ö°ã¤¤¤À¤í¤¦
867 ¹Ô·Á¼°¤Ï¡¢ÆþÎϤ«¤é¼èÆÀ¤µ¤ì¤¿³Æ¹Ô¤ò if-then-else ·Á¼°¤Î
868 ¹Ô¥°¥ë¡¼¥×¤È¤·¤Æ½ÐÎϤµ¤ì¤ëºÝ¤ÎÀ©¸æ¤ò¹Ô¤¦¡£
870 Î㤨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Æ¥¥¹¥È¤Îº¸¤ËÊѹ¹É½¼¨¤Î 1 ʸ»ú¤òɽ¼¨¤·¤Æ
871 ¥Æ¥¥¹¥È¤ò½ÐÎϤ¹¤ë¡£½ÐÎϤκǽé¤Î·å¤Ï¡¢ºï½ü¹Ô¤Ç¤Ï `-'¡¢
872 ÄÉ²Ã¹Ô¤Ç¤Ï `|' ¤È¤Ê¤ê¡¢Êѹ¹¤µ¤ì¤Ê¤«¤Ã¤¿¹Ô¤Ç¤Ï¥¹¥Ú¡¼¥¹¤È¤Ê¤ë¡£
873 ¤³¤Î·Á¼°¤Ç¤Ï¡¢²þ¹Ô¤¬É¬ÍפÊÉôʬ¤Ë¤Ï²þ¹Ô¤òÆþ¤ì¤Æ½ÐÎϤ¹¤ë¡£
876 --old-line-format='-%l
878 --new-line-format='|%l
880 --unchanged-line-format=' %l
884 ¹Ô·Á¼°¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤«¤òÍѤ¤¤ë¡£
886 ¤Ë¤Ï¥·¥§¥ë¤Î¥á¥¿¥¥ã¥é¥¯¥¿¤¬Æþ¤Ã¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢
887 ¥¯¥©¡¼¥È¤¹¤ë¤Ù¤¤Ç¤¢¤í¤¦¡£
889 .BI \-\-old-line-format= FORMAT
890 1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤À¤±¤òÀ°·Á¤¹¤ë¡£
892 .BI \-\-new\-line\-format= FORMAT
893 2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤À¤±¤òÀ°·Á¤¹¤ë¡£
895 .BI \-\-unchanged\-line\-format= FORMAT
896 ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ιԤòÀ°·Á¤¹¤ë¡£
898 .BI \-\-line\-format= FORMAT
899 Á´¤Æ¤Î¹Ô¤òÀ°·Á¤¹¤ë¡£¾åµ¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤ËÅù¤·¤¤¡£
901 ¹Ô·Á¼°¤Ç¤Ï¡¢ÉáÄ̤Îʸ»ú¤Ï¤½¤ì¼«¿È¤òɽ¤¹¡£ÊÑ´¹»ØÄê¤Ï
903 ¤Ç»Ï¤Þ¤ê¡¢°Ê²¼¤Î·Á¼°¤ò¤È¤ë:
906 ¹Ô¤ÎÆâÍƤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤Ï¤¢¤Ã¤Æ¤â´Þ¤Þ¤Ê¤¤¡£
907 ¤³¤Î·Á¼°¤Ç¤Ï¡¢¹Ô¤Ë²þ¹Ô¤¬¤¢¤ë¤«¤É¤¦¤«¤Ï̵»ë¤µ¤ì¤ë¡£
910 ¹Ô¤ÎÆâÍƤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤¬¤¢¤ì¤Ð¤½¤ì¤â´Þ¤à¡£
911 ¹Ô¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð¡¢²þ¹Ô¤Ï¤Ê¤¤¤Þ¤Þ¤Ë¤Ê¤ë¡£
919 ¤Ïʸ»ú 1 ʸ»ú¤Ç¡¢\fIC\fR ¤òɽ¤¹¡£
921 ¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ä¥¢¥Ý¥¹¥È¥í¥Õ¥£¤Ï»ØÄê¤Ç¤¤Ê¤¤¡£
922 Î㤨¤Ð `%c':'' ¤Ï¥³¥í¥ó¤òɽ¤·¡¢¤³¤ì¤Ï if-then-else ·Á¼°¤Î
923 then Éôʬ¤Ç¤â¥³¥í¥ó¤È¤·¤Æ²ò¼á¤µ¤ì¤ë¡£Ä̾ï¤Ï¥³¥í¥ó¤Ï
924 then Éôʬ¤Î½ª¤ï¤ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£
929 ¤Ï 1 ·å¤«¤é 3 ·å¤Þ¤Ç¤Î 8 ¿Ê¿ô»ú¤Ç¤¢¤ê¡¢8 ¿Ê¤Î¥³¡¼¥É
931 ¤ËÂбþ¤¹¤ëʸ»ú¤òɽ¤¹¡£Î㤨¤Ð `%c'\e0'' ¤Ï¥Ê¥ëʸ»ú¤Ë¤Ê¤ë¡£
940 ¤Ë¤è¤êÀ°·Á¤µ¤ì¤¿¹ÔÈÖ¹æ¤òɽ¤¹¡£
941 Î㤨¤Ð `%.5dN' ¤Ï¹ÔÈÖ¹æ¤ò `%.5d' ¤È¤¤¤¦½ñ¼°¤ÇÀ°·Á¤·¤Æɽ¼¨¤¹¤ë¡£
942 printf ÊÑ´¹»ØÄê¤Î¾ÜºÙ¤Ï¡¢¾åµ¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤Î¥µ¥Ö¥»¥¯¥·¥ç¥ó¤ò¸«¤è¡£
946 ¤Ë²þ¹Ôʸ»ú¤ò³¤±¤¿¤â¤Î¤Ç¤¢¤ë¡£ÆþÎϤ˥¿¥Öʸ»ú¤¬¤¢¤ê¡¢
947 ¤½¤ì¤¬½ÐÎϹԤηå·¤¨¤Ë½ÅÍפǤ¢¤ë¾ì¹ç¤Ë¤Ï¡¢`%l' ¤ä `%L' ¤Î¹Ô»ØÄê¤ò
948 ¥¿¥Ö¥¹¥È¥Ã¥×¤Îľ¸å¤ËÃÖ¤¯¤È¤è¤¤
949 (¤¹¤Ê¤ï¤Á `%l' ¤ä `%L' ¤ÎÁ°¤Ë¥¿¥Öʸ»ú¤òÃÖ¤±¤Ð¤è¤¤)¡£
952 ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤Î¤â¤è¤¤¤À¤í¤¦¡£
954 ¹Ô·Á¼°¤È¹Ô¥°¥ë¡¼¥×·Á¼°¤òƱ»þ¤ËÍѤ¤¤ë¤È¡¢ÍÍ¡¹¤Ê·Á¼°»ØÄ꤬²Äǽ¤È¤Ê¤ë¡£
955 Î㤨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï diff ¤ÎÄ̾ï¤Î·Á¼°¤È»÷¤¿·Á¼°¤Î»ØÄê¤Ç¤¢¤ë¡£
956 ¤³¤ì¤ò½¤Àµ¤¹¤ì¤Ð¡¢diff ¤Î½ÐÎϤòÈùÄ´À°¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ë¡£
960 --old-line-format='< %l
962 --new-line-format='> %l
964 --old-group-format='%df%(f=l?:,%dl)d%dE
966 --new-group-format='%dea%dF%(F=L?:,%dL)
968 --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)
971 --unchanged-group-format='' \e
974 .SH ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó
976 ¤Ø¤Î 2 ¤Ä¤Î°ú¿ô¤¬¥Ç¥£¥ì¥¯¥È¥ê¤À¤Ã¤¿¾ì¹ç¡¢
977 ξÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤¬¡¢
978 ¥Õ¥¡¥¤¥ë̾¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤ËÈæ³Ó¤µ¤ì¤ë¡£
979 Ä̾ï¤Ï¥Õ¥¡¥¤¥ë¤Î¥Ú¥¢¤Ë°ã¤¤¤¬Á´¤¯¤Ê¤±¤ì¤Ð¡¢²¿¤â½ÐÎϤ·¤Ê¤¤¡£
980 ¤·¤«¤· \fB\-s\fR ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¡¢Æ±°ì¤Î¥Õ¥¡¥¤¥ë¤âÊó¹ð¤¹¤ë¡£
981 ξÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËƱ̾¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ë¤È¡¢
984 ¤ÏÊó¹ð¤À¤±¤·¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤ÏÈæ³Ó¤·¤Ê¤¤¡£
985 ¤·¤«¤· \fB\-r\fR ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¡¢
986 ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤òé¤ì¤ë¸Â¤ê¡¢Âбþ¤¹¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤¹¤ë¡£
988 ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Ï¡¢
990 ¤ÏÄ̾︺ߤ¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòɽ¼¨¤»¤º¡¢
991 ¥Õ¥¡¥¤¥ë¤¬ÊÒÊý¤Ë¤¢¤Ã¤Æ¾Êý¤Ë¤Ï¤Ê¤¤¤³¤È¤À¤±¤òÊó¹ð¤¹¤ë¡£
994 ¾Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤â¥Õ¥¡¥¤¥ë¤¬¶õ¤Î¾õÂ֤Ǹºß¤¹¤ë¤«¤Î¤è¤¦¤Ë
995 Æ°ºî¤µ¤»¤ë¤³¤È¤â¤Ç¤¤ë¡£¤¹¤Ê¤ï¤Á
997 ¤Ï¼ÂºÝ¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¤¹¤Ù¤Æ½ÐÎϤ¹¤ë¡£
998 (¤³¤Î½ÐÎϤϡ¢¥Õ¥¡¥¤¥ë¤¬Âè 1 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ì¤Ðºï½ü¡¢
999 Âè 2 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ì¤ÐÁÞÆþ¤È¤Ê¤ë¡£)
1004 ¸Å¤¤¤Û¤¦¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÂ礤ʥե¡¥¤¥ë¤¬¤¢¤Ã¤Æ¡¢
1005 ¿·¤·¤¤¤Û¤¦¤Ë¤Ï¤Ê¤¤¾ì¹ç¡¢
1006 .BR \-N " ¥ª¥×¥·¥ç¥ó¤ÎÂå¤ï¤ê¤Ë " \-P
1007 ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¥Ñ¥Ã¥Á¤ÎÂ礤µ¤ò¾®¤µ¤¯¤Ç¤¤ë¡£
1008 .BR \-P " ¥ª¥×¥·¥ç¥ó¤Ï " \-N
1009 ¥ª¥×¥·¥ç¥ó¤È»÷¤Æ¤¤¤ë¤¬¡¢Âè 2 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÀ¤±¤ò
1010 ½ÐÎϤËÁÞÆþ¤·¡¢Âè 1 ¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤Ï̵»ë¤¹¤ë
1011 (¤¹¤Ê¤ï¤Á¡¢Äɲ䵤줿¥Õ¥¡¥¤¥ë¤À¤±¤ò°·¤¦)¡£
1012 ¤½¤·¤Æ¡¢¥Ñ¥Ã¥Á¤òÅö¤Æ¤ëÁ°¤Ë¾Ãµî¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤è¤¦¡¢
1013 ¥Ñ¥Ã¥Á¤ÎÀèƬ¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥æ¡¼¥¶¡¼¤Ø¤Î»Ø¼¨¤ò½ñ¤¯¡£
1015 ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤ËÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ò̵»ë¤µ¤»¤ë¤Ë¤Ï¡¢
1017 ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¡£¥·¥§¥ë¤È¤Ï°Û¤Ê¤ê¡¢¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤Î¥Ô¥ê¥ª¥É¤Ï¡¢
1018 ¥Ñ¥¿¡¼¥óÀèƬ¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
1019 ¥·¥§¥ë¤Ë¤è¤Ã¤ÆŸ³«¤µ¤ì¤Ê¤¤¤è¤¦¡¢
1021 ¤Ï¥¯¥©¡¼¥Èµ¹æ¤Ç°Ï¤¦¤Ù¤¤Ç¤¢¤ë¡£
1022 Î㤨¤Ð `\-x '*.[ao]'' ¤Ï `.a' ¤ä `.o'
1023 ¤Ç½ª¤ï¤ë̾Á°¤Î¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ̵»ë¤¹¤ë¡£
1024 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Ê£¿ô»ØÄꤹ¤ë¤È¤½¤ì¤¾¤ì¤¬Í¸ú¤Ë¤Ê¤ë¡£
1025 Î㤨¤Ð `\-x 'RCS' \-x '*,v'' ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢
1026 ¥Õ¥¡¥¤¥ë̾¤¬ `RCS' ¤À¤Ã¤¿¤ê `*,v' ¤Ç½ª¤ï¤ë¤è¤¦¤Ê
1027 ¥Õ¥¡¥¤¥ë¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤Æ̵»ë¤¹¤ë¡£
1030 ¤Ï°Ê²¼¤ÎÃͤΤɤ줫¤Ç½ªÎ»¤¹¤ë:
1033 Á´¤¯Êѹ¹¤¬¤Ê¤«¤Ã¤¿¡£
1039 ²¿¤é¤«¤Î¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¡£
1049 ¥×¥í¥°¥é¥à¤Î¥Ð¥°¤Ë¤Ä¤¤¤Æ¤Ï bug-gnu-utils@gnu.org ¤ØÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£
1050 ¥Ú¡¼¥¸¤Î¹¹¿·¤Ï Ragnar Hojland Espinosa
1051 <ragnar@ragnar-hojland.com> ¤¬¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£