.\" You may copy, distribute and modify under the terms of the LDP General
.\" Public License as specified in the LICENSE file that comes with the
.\" gnumaniak distribution
.\"
.\" The author kindly requests that no comments regarding the "better"
.\" suitability or up-to-date notices of any info documentation alternative
.\" is added without contacting him first.
.\"
.\" (C) 2002 Ragnar Hojland Espinosa <ragnar@ragnar-hojland.com>
.\"
.\"     GNU diff man page
.\"     man pages are NOT obsolete!
.\"     <ragnar@ragnar-hojland.com>
.\"
.\" Japanese Version Copyright (c) 2000 NAKANO Takeo all rights reserved.
.\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
.\" Updated & Modified Sat Jan 24 10:40:25 JST 2004
.\"         by Yuichi SATO <ysato444@yahoo.co.jp>
.\"
.\"WORD:	context		ƥ
.\"WORD:	format		[ʸ̮ˤä]  ()
.\"WORD:	recursively	ƵŪ
.\"WORD:	basename	ե̾ base  [줷...]
.\"WORD:	heuristics	ҥ塼ꥹƥåʼˡ
.\"WORD:	header		إå
.\"WORD:	gutter		
.\"WORD:	(in)complete	˲Ԥ (ʤ)
.\"WORD:	null character	ʥʸ
.\"
.TH DIFF 1 "October 2002" "GNU diff Utilities 2.8.1"
.SH ̾
diff \- 2 ĤΥե֤ΰ㤤õ
.SH 
.B diff
[\fB\-abcdefhilnpqrstuwyBEHNPT\fR]
[\-\fILINES\fR]
[\fB\-x \fIPATTERN\fR]
[\fB\-C \fILINES\fR]
[\fB\-D \fINAME\fR]
[\fB\-F \fIREGEXP\fR] 
[\fB\-I \fIREGEXP\fR]
[\fB\-L \fILABEL\fR]
[\fB\-S \fIFILE\fR]
[\fB\-U \fILINES\fR]
[\fB\-W \fICOLUMNS\fR]
[\fB\-X \fIFILE\fR]
[\fB\-\-binary\fR]
[\fB\-\-brief\fR]
[\fB\-\-changed\-group\-format=\fIfORMAT\fR]
[\fB\-\-context\fR[\fB=\fILINES\fR]]
[\fB\-\-diff\-program=\fIPROGRAM\fR]
[\fB\-\-ed\fR]
[\fB\-\-exclude=\fIPATTERN\fR]
[\fB\-\-exclude-from=\fIFILE\fR]
[\fB\-\-expand\-tabs\fR]
[\fB\-\-forward\-ed\fR]
[\fB\-\-from\-file=\fIFILE\fR]
[\fB\-\-horizon\-lines=\fILINES\fR]
[\fB\-\-ifdef=\fINAME\fR]
[\fB\-\-ignore\-all\-space\fR]
[\fB\-\-ignore\-blank\-lines\fR]
[\fB\-\-ignore\-case\fR]
[\fB\-\-ignore\-file\-name\-case\fR]
[\fB\-\-ignore\-matching\-lines=\fIREGEXP\fR]
[\fB\-\-ignore\-space\-change\fR]
[\fB\-\-ignore\-tab\-expansion\fR]
[\fB\-\-inhibit\-hunk\-merge\fR]
[\fB\-\-initial\-tab]
[\fB\-\-label=\fILABEL\fR]
[\fB\-\-left\-column\fR]
[\fB\-\-line\-format=\fIFORMAT\fR]
[\fB\-\-minimal\fR]
[\fB\-\-new\-file\fR]
[\fB\-\-new\-group\-format=\fIFORMAT\fR]
[\fB\-\-new\-line\-format=\fIFORMAT\fR] 
[\fB\-\-no\-ignore\-file\-name\-case] 
[\fB\-\-old\-group\-format=\fIFORMAT\fR]
[\fB\-\-old\-line\-format=\fIFORMAT\fR]
[\fB\-\-paginate\fR] [\fB\-\-rcs\fR]
[\fB\-\-recursive\fR]
[\fB\-\-report\-identical\-files\fR]
[\fB\-\-sdiff\-merge\-assist\fR]
[\fB\-\-show\-c\-function\fR]
[\fB\-\-show\-function\-line=\fIREGEXP\fR]
[\fB\-\-side\-by\-side\fR]
[\fB\-\-speed\-large\-files\fR]
[\fB\-\-starting\-file=\fIFILE\fR]
[\fB\-\-strip\-trailing\-cr\fR]
[\fB\-\-supress\-common\-lines\fR]
[\fB\-\-text\fR] 
[\fB\-\-to\-file=\fIFILE\fR]
[\fB\-\-unchanged\-group\-format=\fIFORMAT\fR]
[\fB\-\-unchanged\-line\-format=\fIFORMAT\fR]
[\fB\-\-unidirectional\-new\-file]
[\fB\-\-unified\fR[\fB=\fILINES\fR]]
[\fB\-\-width=\fICOLUMNS\fR]
.I FROMFILE TOFILE

.B diff
[\fB\-v\fR] [\fB\-\-help\fR] [\fB\-\-version\fR]

.SH 
.B diff
 2 ĤΥեӤΰ㤤򵭽ҤƽϤ롣

äȤñʾϡоݤΥե
.I FROMFILE

.I TOFILE
Ǥ롣ΥեΤΤɤ餫
.RB ` \- '
ȻꤷƤɤλϤΥեɸϤɤ߹ޤ롣

.I FROMFILE
ǥ쥯ȥ
.I TOFILE
ǥ쥯ȥǤϤʤ硢
.B diff
ϥǥ쥯ȥ
.I FROMFILE
ˤ롢ե̾
.I TOFILE
Υեоݤˤ (դƱ)
ǥ쥯ȥǤʤλ
.RB ` \- '
ˤ뤳ȤϤǤʤ

ξǥ쥯ȥΤȤϡ
.B diff
Υǥ쥯ȥˤ롢бե
ե٥åȽˤ줾Ӥ롣
ӤϺƵŪˤϹԤʤ
.B \-r
ޤ
.B \-\-recursive
ץꤹкƵŪˤʤ롣
.B diff
ϥǥ쥯ȥƤΤΤեΤ褦Ӥ뤳ȤϤʤ
եѥΥե
.RB ` \- '
ǤäƤϤʤʤʤʤɸϤˤ̾ʤΤǡ
Ʊ̾ΥեפȤǰȤʤǤ롣

.B \-\-from\-file=\fIFILE\fR
ץͿȡǤդοΥե̾Ϳ뤳ȤǤ
줾Υե \fIFILE\fP Ӥ롣
Ʊͤˡ
.B \-\-to\-file=\fIFILE\fR
ץͿȡ줾ꤵ줿ե
\fIFILE\fP Ӥ롣
[: 2.7 ˤϤΥץ¸ߤʤ]
.SH ץ
.TP
.BI \- LINES
ۤʤäƤʬ
.I LINES
 () ʬΥƥȤɽ롣
ΥץϽϷΤλϹԤʤ
ä
.BR \-c "  " \-u
ץȰѤʤȡʤθ̤ʤ
Υץ obsolete Ǥ롣
.BR patch (1)
ưˤϡʤȤ 2 ԤΥƥȤɬפǤ롣
.TP
.B \-a, \-\-text
ե뤬ƥȤˤϸʤ褦ʾǤ⡢
ƤΥեƥȤȤߤʤ 1 ԤӤԤ
.TP
.B \-b, \-\-ignore\-space\-change
ڡο㤦ˤϰ㤤̵뤹롣
ԴʹԤ̵뤵롣
.TP
.B \-c
context ϷѤ롣
.TP
.B \-d, \-\-minimal
르ꥺѹ꾮ʺʬǤ褦ˤ롣
Ȥ
.B diff
٤ʤ (٤ʤ⤢)
.TP
.B \-e, \-\-ed
.BR ed (1)
ΥץȷǽϤ롣
.TP
.B \-f, \-\-forward\-ed
.B ed
ΥץȤȰ츫Ʊ褦ʽϤ򤹤롣
Ϥ˸ۤʤ [: ä
.B ed
ǤϻȤʤ]
.TP
.B \-h
ߤϲ̤ʤUnix ȤθߴΤ¸ߤƤ롣
Ͽ侩ʤ
.TP
.B \-i, \-\-ignore\-case
ʸȾʸΰ㤤̵뤹롣
.TP
.B \-l, \-\-paginate
Ϥ
.BR pr (1)
̤ƥڡդԤ
.TP
.B \-n, \-\-rcs
RCS  diff Ϥ롣
.B \-f
ȻƤ뤬줾ΥޥɤϽԿꤹ롣
.TP
.B \-p, \-\-show\-c\-function
ѹɤ C ؿǹԤ줿Τɽ롣
`\-F'^[_a\-zA\-Z$]''
Ʊ
.TP
.B \-q, \-\-brief
ե뤬㤦ɤ𤹤롣
㤤ξܺ٤𤷤ʤ
.TP
.B \-r, \-\-recursive
ǥ쥯ȥӤȤ
դä֥ǥ쥯ȥ򤹤٤ƺƵŪӤ롣
.TP
.B \-s, \-\-report\-identical\-files
2 ĤΥե뤬ƱäȤ𤹤롣
.TP
.B \-t, \-\-expand\-tabs
ϥեǤΥ֤ˤ֤碌¸뤿ᡢ
ϤΥ֤򥹥ڡŸ롣
.TP
.B \-u
unified ϷѤ롣
.TP
.B \-w, \-\-ignore\-all\-space
ԤӤȤڡ̵뤹롣
ԴʹԤ̵뤵롣
.TP
.BI "\-x " PATTERN ", \-\-exclude=" PATTERN
ǥ쥯ȥӤȤ
ե̾ base 
.I PATTERN
˥ޥåե䥵֥ǥ쥯ȥ̵뤹롣
.TP
.B \-y, \-\-side\-by\-side
side-by-side ϷѤ롣
.TP
.B \-B, \-\-ignore\-blank\-lines
Ԥѹ̵뤹롣
.TP
.BI "\-C " LINES ", \-\-context[=" LINES ]
context ϷѤ
.I LINES
 () ΥƥȤɽ롣
.I LINES
Ϳʤ 3 ɽ롣
.B patch
ư뤿ˤϡ
ʤȤ 2 ԤΥƥȤɬפǤ뤳Ȥ¿
.TP
.BI "\-D " NAME ", \-\-ifdef=" NAME
if-then-else ǥޡ줿ϤԤ
ץץåξޥ
.I NAME
Ѥ롣
.TP
.B "\-E, \-\-ignore\-tab\-expansion"
Ÿˤ륹ڡѹ̵뤹롣
.TP
.BI "\-F " REGEXP ", \-\-show\-function\-line=" REGEXP
context  unified ˤơ
ƺʬ hunk (ƥȥ֥å) Ф

.I REGEXP
˥ޥåǸιԤΰɽ롣
.TP
.B \-H, \-\-speed\-large\-files
ѹ̤ˤ褦礭ʥե®˰ˡ
ҥ塼ꥹƥåʼˡѤ롣
û̷ \-H Ͽ侩ʤʤä
.TP
.BI "\-I " REGEXP ", \-\-ignore\-matching\-lines=" REGEXP
.I REGEXP
˥ޥå褦ʹԤѹ̵뤹롣
.TP
.BI "\-L " LABEL ", \-\-label=" LABEL
context  unified Υإåˡ
ե̾ǤϤʤ
.I LABEL
Ѥ롣
û̷ \-L Ͽ侩ʤʤä
.TP
.B \-N, \-\-new\-file
ǥ쥯ȥӤݡ
Υǥ쥯ȥˤΤߥե뤬¸ߤƤ顢
⤦Υǥ쥯ȥˤƱ̾ζäݤΥե뤬褦ư롣
.TP
.B \-P, \-\-unidirectional\-new\-file
ǥ쥯ȥӤݡ
2 ܤΥǥ쥯ȥˤΤߥե뤬¸ߤƤ顢
1 ܤΥǥ쥯ȥˤƱ̾ζäݤΥե뤬褦ư롣
û̷ \-P Ͽ侩ʤʤä
.TP
.BI "\-S " FILE ", \-\-starting\-file=" FILE
ǥ쥯ȥӤݡ
.I FILE
Ϥ롣ǤӤ³ԤݤѤǤ롣
.TP
.B \-T, \-\-initial\-tab
normal  context ǡƥȤ˥ڡǤʤ֤Ϥ롣
ȹǤΥ֤ˤ·̤˸롣
.TP
.BI "\-U " LINES ", \-\-unified" \fR[ = LINES \fR]
unified ϷѤ
.I LINES
 () ΥƥȤɽ롣
.I LINES
Ϳʤ 3 ɽ롣
.B patch
ư뤿ˤϡ
ʤȤ 2 ԤΥƥȤɬפǤ뤳Ȥ¿
.TP
.BI "\-W " COLUMNS ", \-\-width=" COLUMNS
side-by-side ǡϤ
.I COLUMNS
ˤ롣
.TP
.BI \-X FILE ", \-\-exclude\-from=" FILE
ǥ쥯ȥӤݡ
ե̾ base 
.I FILE
ΥѥΤ줫˥ޥåե䥵֥ǥ쥯ȥ̵뤹롣
.TP
.B \-\-binary
ǡХʥ⡼ɤɤ߽񤭤
(Linux 䤽¾ POSIX ۥȤǤϰ̣ʤ)
.TP
.BI \-\-changed\-group\-format= FORMAT
if-then-else ǡ
ξΥեǰۤʤԥ롼פνϤ
.I FORMAT
Ѥ롣
.TP
.B \-\-diff\-program= \fIPROGRAM
եӤ뤿 \fBdiff\fR ȸߴΤ
ץ \fIPROGRAM\fR Ѥ롣
.TP
.BI \-\-from\-file= FILE
.I FILE
ƥڥɤӤ (\fIFILE\fR ϥǥ쥯ȥǤɤ)
[: 2.7 ˤϤΥץ¸ߤʤ]
.TP
.BI \-\-horizon\-lines= LINES
ʬäȤ⥳ѥȤ˽Ϥ뤿ˡ
㤦ʬˤ붦ʬΤ줾
.I LINES
ԤΤƤ¸롣
.TP
.B \-\-ignore\-file\-name\-case
եӤݤ˥ե̾ʸʸ̵뤹롣
Τ ``foo''  ``Foo'' ƱȤΤǡߤӤ롣
.TP
.B \-\-inhibit\-hunk\-merge
ܤ hunk ζư hunk ޡưԤʤ
.TP
.B \-\-left\-column
side-by-side ǡ̤ʹԤϺ¦ˤɽʤ
.TP
.BI \-\-line\-format= FORMAT
if-then-else ǡƤϹԤνϤ
.I FORMAT
Ѥ롣
.TP
.BI \-\-new\-group\-format= FORMAT
if-then-else ǡ
2 ܤΥեˤԥ롼פνϤ
.I FORMAT
Ѥ롣
.TP
.BI \-\-new\-line\-format= FORMAT
if-then-else ǡ
2 ܤΥեˤԤνϤ
.I FORMAT
Ѥ롣
.TP
.B \-\-no\-ignore\-file\-name\-case
եӤݤˡե̾ʸʸθ롣
Τ ``foo''  ``Foo'' ƱΤȤʤ
\fB\-\-ignore\-file\-name\-case\fR 򻲾Ȥ뤳ȡ
.TP
.BI \-\-old\-group\-format= FORMAT
if-then-else ǡ
1 ܤΥեˤԥ롼פνϤ
.I FORMAT
Ѥ롣
.TP
.BI \-\-old\-line\-format= FORMAT
if-then-else ǡ
1 ܤΥեˤԤνϤ
.I FORMAT
Ѥ롣
.TP
.B \-\-sdiff\-merge\-assist
.BR sdiff (1)
Ѥɲþɽ롣
.B sdiff

.B diff
¹ԤȤˤΥץѤ롣
̾Υ桼ΥץľܻꤹϤޤꤵƤʤ
.TP
.B \-\-strip\-trailing\-cr
 CR 
ΥޡȤ CRLF ȤƥνϤȤΩġ
.TP
.B \-\-suppress\-common\-lines
side-by-side Ƕ̤ʹԤɽʤ
.TP
.BI \-\-unchanged\-group\-format= FORMAT
if-then-else ǡ
ξΥե˶̤ʹԥ롼פνϤ
.I FORMAT
Ѥ롣
.TP
.BI \-\-unchanged\-line\-format= FORMAT
if-then-else ǡ
ξΥե˶̤ʹԤνϤ
.I FORMAT
Ѥ롣
.TP
.B "\-\-help"
ɸϤ˻ˡΥåϤｪλ롣
.TP
.B \-v, \-\-version
.B diff
ΥСֹϤ롣
.SH Ϥη
.\"nakano: normal format ʤ...
.SS context 
context Ϸ 2 ԤΥإåϤޤ롣
ϰʲΤ褦ʤΤǤ:
.sp
.nf
*** FROMFILE FROMFILE-MODIFICATION-TIME
--- TOFILE TOFILE-MODIFICATION-TIME
.fi
.sp
.BI \-L " LABEL"
ѤȥإåƤѲ롣
Τ hunk (ƥȥ֥å) Ǥ롣
֤о줹뤳Ȥ⤢롣
context  hunk ϰʲΤ褦ʤΤǤ:
.sp
.nf
***************
*** FROMFILE-LINE-RANGE ****
  FROMFILE-LINE
  FROMFILE-LINE...
--- TOFILE-LINE-RANGE ----
  TOFILE-LINE
  TOFILE-LINE...
.fi
.sp
ۤʤäƤԤμդΥƥȤγƹԤˤϡ
Ƭ 2 ĤΥڡĤƤ롣
2 ĤΥե֤ǰۤʤäƤԤˤϡ
ƬɽʸȥڡĤ
.TP
.B !
2 ĤΥե֤ѹ줿ʬγƹԡ
⤦Υեбʬ
.RB ` ! '
ǥޡɽ롣
.TP
.B +
2 ĤΥեǡ줿׹ԡ1 ĤΥեбʬϤʤ
.TP
.B -
1 ĤΥեǡֺ줿׹ԡ2 ĤΥեбʬϤʤ
.PP
hunk ƤѹǤС
.I FROMFILE
ƹԤϾά롣ޤƤѹǤС
.I TOFILE
ƹԤϾά롣
.SS unified 
.sp
.nf   
--- FROMFILE FROMFILE-MODIFICATION-TIME
+++ TOFILE TOFILE-MODIFICATION-TIME
.fi
.sp
.BI \-L " LABEL"
ѤȥإåƤѲ롣
Τ hunk (ƥȥ֥å) Ǥ롣֤о줹뤳Ȥ⤢롣
줾 hunk ϥեΰۤʤäƤ 1  1 Ĥʬ򼨤Ƥ롣
unified  hunk ϰʲΤ褦ʤΤǤ:
.sp
.nf
@@ FROMFILE-RANGE TOFILE-RANGE @@
LINE-FROM-EITHER-FILE
LINE-FROM-EITHER-FILE...
.fi
.sp
ξԤǶ̤ʹԤˤ 1 ĤΥڡ֤롣
ۤʤԤˤϰʲɽʸ֤:
.TP
.B +
 1 ĤΥե˹ԤɲäԤ줿
.TP
.B -
 1 ĤΥե뤫ԤκԤ줿
.SS side-by-side 
ե 2 ɽ졢֤˹ (gutter) ֤롣
¤ˤϰʲΥޡΤ줫 1 Ĥޤޤ롣
.TP
.B ` '
бԤ̤Ǥ롣ĤޤꡢξιԤƱǤ뤫
㤤
.B \-\-ignore
ץΤ줫ˤä̵뤵줿
.TP
.B |
бԤۤʤ롣ξȤⴰξȤԴǤ롣
.TP
.B <
եϰۤʤꡢ1 ܤΥեˤιԤޤޤƤ롣
.TP
.B >
եϰۤʤꡢ2 ܤΥեˤιԤޤޤƤ롣
.TP
.B (
1 ܤΥեˤιԤޤޤƤ뤬㤤̵뤵롣
.TP
.B )
2 ܤΥեˤιԤޤޤƤ뤬㤤̵뤵롣
.TP
.B \e
бԤۤʤ롣1 ܤιԤ˹βԤʤ
.TP
.B /
бԤۤʤ롣2 ܤιԤ˹βԤʤ
̾ϹԤϡ˴ޤޤԤ˲Ԥʤ˸¤äƲԤʤ
ϹԤ 2 ԤκۤɽƤˤϡ
˲Ԥʤ⤢롣ξϹԤˤϲԤϤ뤬
¤Υޡ 1 ܤι˲Ԥʤ
.RB ` \e '
ˡ2 ܤι˲Ԥʤ
.RB ` / '
ˤʤ롣
.PP
side-by-side ɤߤ䤹褦ʾ⤢뤬³⤢롣
η̾⤺äȹνϤ
ĹԤޤǤޤ
ޤνϤǤ̾ʸؤΰ¸礭ʤΤǡ
եȤȤäƤʤäꡢ̾Ȱۤʤ륿֥ȥåפȤäƤꡢ
ʤʸȤäƤꤹȡϤ˽ʤ롣
.SS ed(1) 
1 İʾκʬ hunk 鹽롣
˶ᤤѹ˸졢ԿѲʹߤ
.B ed
ιֹ˱ƶʤ褦ˤʤäƤ롣
.B ed
 hunk ϰʲΤ褦ʤΤǤ:
.sp
.nf
CHANGE-COMMAND
TO-FILE-LINE
TO-FILE-LINE...
\&.
.fi
.sp
.B ed
Ϥɽ˥ԥꥪ 1 ĤιԤѤΤǡ
.B diff
ѹ줿ԤΤԥꥪ 1 ĤιԤ
ԥꥪ 2 ĤѹƥץƥȤ
³ 2 ĤΥԥꥪɤ 1 Ĥˤ ed ޥɤ񤯡
.B ed
ϲԤƤʤԤɽȤǤʤ
ä 2 ܤΥեκǽԤѹƤơ
IJԤƤʤä硢
.B diff
ϥ顼𤷤ơԤ뤫Τ褦ư롣

ѹޥɤˤ 3 Ĥμब롣
줾졢1 ܤΥեιֹ (ޤϥ޶ڤιϰϻ)
³ѹμ򼨤 1 ʸʸʤ롣
ֹϡ٤ƥեΥꥸʥιֹǤ롣
ѹޥɤμϰʲ̤:
.TP
.IB L a
1 ܤΥե \fIL\fP ܰʹߤˡ2 ܤΥե뤫ƥȤɲä롣
㤨 `8a' ϡʹߤιԤե 1  8 ܰʹߤɲä롣
.TP
.IB R c	
1 ܤΥեιϰ \fIR\fP 
³Ԥ֤롣ɲäȺȤ߹碌ǤƱȤǤ뤬
ΤۤѥȤǤ롣㤨 `5,7c' ϥե 1 
5 ܤ 7 ܤե 2 ɤ߹Ƥ֤롣
.\"nakano: ä to read as.. ȤѤ⡣
.TP
.IB R d	
1 ܤΥեιϰ \fIR\fP 롣
㤨 `5,7d' ϥե 1  5 ܤ 7 ܤޤǤ롣
.PP
.B diff

.B ed
ץȤΤ褦ʽϤǡij hunk  forward  (Ƭ)
Τ褦ʽϤǤ롣ޥɤηäѲƤ롣
ޥʸԤϰϤΤǤ롣
ޤԥꥪ 1 ĤιԤ̰뤳Ȥ⤷ʤ
.\"nakano: (^^;
.B ed
Ʊͤˡforward
.B ed
ԤƤʤԤɽȤϤǤʤ

forward
.B ed
ϤޤǤϤʤʤʤ
.B ed

.B patch
⤳η diff Ѥ뤳ȤǤʤǤ롣
ϼ˸ŤС
.B diff
ȤθߴΤ¸ߤƤ롣
.SS RCS 
RCS Ϸ Revision Control System (RCS)
Ѥ뤿̤߷פ줿ΤǤ롣
RCS ϥС䥷ƥΰۤʤե򰷤Ρ
ե꡼ʥץॻåȤǤ롣
η forward
.B ed
ȻƤ뤬
ԥꥪ 1 ĤιԤԤƤʤԤ򤷤ƤΤǡ
եƤǤդѹɽȤǤ롣
ƥȥԥꥪ 1 ĤιԤǽΤǤϤʤ
줾ΥޥɤǡŬѤԿꤷƤΤǤ롣ޤ
.RB ` c '
ޥɤ
.RB ` a "'  `" d '
Ȥ߹碌ѤƤ롣
 2 ܤΥեѹƤơ
IJԤǽäƤʤˤϡ
ϤԤʤ֤ǽ롣
.SH IF\-THEN\-ELSE
.SS C 
.B diff
Ѥ 2 ե C ɤޡ뤳ȤǤ롣
νϷˤϡξΥեιԤ٤ƴޤޤ롣
ξΥե˶̤ʹԤϰ٤о줷ʤ
ۤʤʬ C ץץåλѤʬΥ롣
.BI "#ifdef " NAME
ޤ
.B #ifndef 
.IR NAME ,
,BR #else ", and " #endif
Ǥ롣
Ϥ򥳥ѥ뤹Ȥޥ
.I NAME
ꡢ̤Τޤޤˤ뤳Ȥˤäơ
ɤΥСȤǤ롣
 
㤨С`wait (&s)' Ȥ󥹥󥹤 `waitpid (-1, &s, 0)'
ѹΥե
`\fB--ifdef=\fIHAVE_WAITPID\fR' ץˤäƥޡȡ
ƶʬΥɤϰʲΤ褦ˤʤ:
.sp
.nf
    do {
 #ifndef HAVE_WAITPID
          if ((w = wait (&s)) < 0 && errno != EINTR)
 #else /* HAVE_WAITPID */
          if ((w = waitpid (-1, &s, 0)) < 0  &&  errno != EINTR)
 #endif /* HAVE_WAITPID */
          return w;
    } while (w != child);
.fi
.\"nakano: "Line group formats" δְ㤤.
.SS ԥ롼׷
ԥ롼׷Ѥȡ
if-then-else Ϥ¿ΥץꥱŬǤ롣
㤨Хץߥ󥰸ʸʤɤ󤲤롣
ԥ롼׷ϡ
ƤԤʤܤ롼פνϷꤹ롣

㤨СʲΥޥɤ TeX ե `old'  `new' Ӥ
old ʬ `\ebegin{em}'-`\eend{em}' ǰϤߡ
new ʬ `\ebegin{bf}'-`\eend{bf}' ǰϤǥޡǽϤ롣
.sp
.nf
 diff \e
    --old-group-format='\ebegin{em}
 %<\eend{em}
 '  \e
    --new-group-format='\ebegin{bf}
 %>\eend{bf}
 '  \e
    old new
.fi
.sp						       
ʲΥޥɤ嵭Ʊ䵭Ҥ¿
ǥեȤιԥ롼׷ꤷƤ뤫Ǥ롣
.sp
.nf
 diff \e
    --old-group-format='\ebegin{em}
 %<\eend{em}
 ' \e
    --new-group-format='\ebegin{bf}
 %>\eend{bf}
 ' \e
    --unchanged-group-format='%=' \e
    --changed-group-format='\ebegin{em}
 %<\eend{em}
 \ebegin{bf}
 %>\eend{bf}
 '  \e
    old new
.fi
.sp
ˤ⤦ʤҲ𤹤롣ϺʬꥹȤ
 "plain English" ǹֹ񤤤إåȤȤ˽Ϥ롣
.sp
.nf
 diff \e
    --unchanged-group-format='' \e
    --old-group-format='-------- %dn line%(n=1?:s) deleted at %df:
 %<' \e
    --new-group-format='-------- %dN line%(N=1?:s) added after %de:
 %>' \e
    --changed-group-format='-------- %dn line%(n=1?:s) changed at %df:
 %<-------- to:
 %>' \e
    old new
.fi
.sp
ԥ롼׷ꤹˤϡ
.B diff
ʲΥץΤɤ줫 1 ĤꤷƼ¹Ԥ롣
4 ĤޤǤιԥ롼׷Ǥ
ƻ꤬줾ԥ롼 1 Ĥб롣
.I FORMAT
ˤϥΥ᥿饯äƤ뤳Ȥ¿Τǡ
Ȥ٤Ǥ
.TP
.BI \-\-old-group\-format= FORMAT
ιԥ롼פ 1 ܤΥեˤԤʤ hunk Ǥ롣
ǥեȤ old 롼׷ϡchanged 롼׷ꤵƤ
Ʊˤʤ롣Ƥʤйԥ롼פϤΤޤޤΤǽϤ롣
.TP
.BI \-\-new-group\-format= FORMAT
ιԥ롼פ 2 ܤΥեˤԤʤ hunk Ǥ롣
ǥեȤ new 롼׷ϡchanged 롼׷ꤵƤ
Ʊˤʤ롣Ƥʤйԥ롼פϤΤޤޤΤǽϤ롣
.TP
.BI \-\-changed\-group\-format= FORMAT
ιԥ롼פξΥեιԤʤ hunk Ǥ롣
ǥեȤ changed 롼׷ϡ
old 롼פ new 롼פηϢ뤷ΤǤ롣
.TP
.BI \-\-unchanged\-group\-format= FORMAT
ιԥ롼פξΥե˶̤ιԤʤ hunk Ǥ롣
ǥեȤ unchanged 롼׷ϡ
ԥ롼פ򤽤ΤޤޤΤǽϤΤǤ롣
.SS 롼Ѵ
.TP
.B %<
1 ܤΥե뤫ιԤ̣롣βԤޤࡣ
ƹԤ old Էˤä롣
.TP
.B %>
2 ܤΥե뤫ιԤ̣롣βԤޤࡣ
ƹԤ new Էˤä롣
.TP
.B %=
ξΥեǶ̤ʹԤ̣롣βԤޤࡣ
ƹԤ unchanged Էˤä롣
.TP
.B %%
`%' ɽ
.TP
.B %c'\fIC\fB''

.I C
ʸ 1 ʸǡ\fIC\fR ɽ
.I C
˥Хåå䥢ݥȥեϻǤʤ
㤨 `%c':'' ϥɽ if-then-else 
then ʬǤ⥳ȤƲᤵ롣̾ϥ
then ʬνȤư롣
.TP
.B %c'\eO''

.I 0
 1 夫 3 ޤǤ 8 ʿǤꡢ8 ʤΥ
.I 0
бʸɽ㤨 `%c'\e0'' ϥʥʸˤʤ롣
.TP
.BI ( A = B ? T : E )
.IR A "  " B

.IR T 
ʤ
.IR E 
.IR A "  " B
Ϥ줾 10 ʿ嵭Τ褦˲ᤵʸ 1 ĤǤ롣
η
.IR A " ͤ " B "  " T " Ǥꡢ
ʳξ
.I E
Ǥ롣

㤨 `%(N=0?no:%dN) line%(N=1?:s)' 
N (new ե뤫Υ롼פιԿ)  0 ʤ `no lines' Ȥʤꡢ
N  1 ʤ `1 line' Ȥʤꡢʳξ `%dN lines' Ȥʤ롣
.TP
.I FN

.I F

.BR printf (3)
Ѵǡ
.I N
ϰʲʸΤɤ줫Ǥ롣
.RI  F " 줿 " N " ͡
ɽ
.I 
.RS
.TP
.B e
old ե뤫Υ롼פľιԤιֹ档
.TP
.B f
old ե뤫Υ롼פκǽιֹ档e + 1 
.TP
.B l
old ե뤫Υ롼פιֹ档
.TP
.B m
old ե뤫Υ롼פľιԤιֹ档l + 1 
.TP
.B n
old ե뤫Υ롼פιԿl - f + 1 
.TP
.B E, F, L, M, N
嵭Ʊͤ new ե뤫Υ롼פΤΡ
.RE
.sp
.B printf
Ѵˤ
.BR %d ", " %o ", " %x ", " %X 
(줾 10 , 8 , ʸ 16 , ʸ 16 ) Ȥ롣
.RB ` % '
θˤϰʲΥץ˻Ǥ롣
.RB ` - '
(ͤλ) (եɤκ)
ԥꥪɤȿ (ͤϾά; κǾ) Ǥ롣
㤨 `%5dN'  new ե뤫Υ롼פιԿ
5 ʸΥեɤˡ
.B printf
 "%5d" 񼰤Ѥɽ롣
.\"nakano: "Line format" δְ㤤
.SS Է
ԷϡϤ줿ƹԤ if-then-else 
ԥ롼פȤƽϤݤԤ
   
㤨СʲΥޥɤϡƥȤκѹɽ 1 ʸɽ
ƥȤϤ롣ϤκǽηϡԤǤ `-'
ɲùԤǤ `|' ȤʤꡢѹʤäԤǤϥڡȤʤ롣
ηǤϡԤɬפʬˤϲԤƽϤ롣
      
 diff \e
    --old-line-format='-%l
 ' \e
    --new-line-format='|%l
 ' \e
    --unchanged-line-format=' %l
 ' \e
   old new

ԷꤹˤϡʲΥץΤɤ줫Ѥ롣
.I FORMAT
ˤϥΥ᥿饯äƤ뤳Ȥ¿Τǡ
Ȥ٤Ǥ
.TP
.BI \-\-old-line-format= FORMAT
1 ܤΥե뤫ιԤ롣
.TP
.BI \-\-new\-line\-format= FORMAT
2 ܤΥե뤫ιԤ롣
.TP
.BI \-\-unchanged\-line\-format= FORMAT
ξΥե˶̤ιԤ롣
.TP
.BI \-\-line\-format= FORMAT
ƤιԤ롣嵭ƤΥץꤷ
.PP
ԷǤϡ̤ʸϤ켫ȤɽѴ
.RB ` % '
ǻϤޤꡢʲηȤ:
.TP
.B %l
ԤƤ̣롣βԤϤäƤޤޤʤ
ηǤϡԤ˲Ԥ뤫ɤ̵뤵롣
.TP
.B %L
ԤƤ̣롣βԤФޤࡣ
Ԥ˲ԤʤСԤϤʤޤޤˤʤ롣
.TP
.B %%
`%' ɽ
.TP
.B %c'\fIC\fB''

.I C
ʸ 1 ʸǡ\fIC\fR ɽ
.I C
˥Хåå䥢ݥȥեϻǤʤ
㤨 `%c':'' ϥɽ if-then-else 
then ʬǤ⥳ȤƲᤵ롣̾ϥ
then ʬνȤư롣
.TP
.B %c'\eO''

.I 0
 1 夫 3 ޤǤ 8 ʿǤꡢ8 ʤΥ
.I 0
бʸɽ㤨 `%c'\e0'' ϥʥʸˤʤ롣
.TP
.I Fn

.I F

.BR printf (3)
Ѵǡ
.I F
ˤ줿ֹɽ
㤨 `%.5dN' Ϲֹ `%.5d' Ȥ񼰤ɽ롣
printf Ѵξܺ٤ϡ嵭ιԥ롼׷Υ֥򸫤衣
.PP
ǥեȤιԷ
.RB ` %l '
˲ʸ³ΤǤ롣Ϥ˥ʸꡢ
줬ϹԤη·˽פǤˤϡ`%l'  `%L' ιԻ
֥ȥåפľ֤Ȥ褤
(ʤ `%l'  `%L' ˥ʸ֤Ф褤)
뤤
.B \-t
ץѤΤ褤

Էȹԥ롼׷ƱѤȡ͡ʷ꤬ǽȤʤ롣
㤨СʲΥޥɤ diff ̾ηȻλǤ롣
Сdiff νϤĴ뤳Ȥǽˤʤ롣
.sp
.nf
 diff \e
    --old-line-format='< %l
 ' \e
    --new-line-format='> %l
 ' \e
    --old-group-format='%df%(f=l?:,%dl)d%dE
 %<' \e
    --new-group-format='%dea%dF%(F=L?:,%dL)
 %>' \e
    --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)
 %<---
 %>' \e
    --unchanged-group-format='' \e
    old new
.fi
.SH ǥ쥯ȥ
.B diff
ؤ 2 Ĥΰǥ쥯ȥä硢
ξΥǥ쥯ȥˤ줾Υե뤬
ե̾Υե٥åȽӤ롣
̾ϥեΥڥ˰㤤ʤСϤʤ
 \fB\-s\fR ץѤȡƱΥե𤹤롣
ξΥǥ쥯ȥƱ̾Υ֥ǥ쥯ȥ꤬ȡ
̾
.B diff
ƥ֥ǥ쥯ȥʲΥեӤʤ
 \fB\-r\fR ץѤȡ
ǥ쥯ȥĥ꡼é¤ꡢбƤΥեӤ롣

Υǥ쥯ȥˤեФƤϡ
.B diff
̾¸ߤեƤɽ
ե뤬ˤä¾ˤϤʤȤ𤹤롣
.B diff
ο񤤤Ѥơ
¾Υǥ쥯ȥˤե뤬ξ֤¸ߤ뤫Τ褦
ư뤳ȤǤ롣ʤ
.B diff
ϼºݤ¸ߤեƤ򤹤٤ƽϤ롣
(νϤϡե뤬 1 ǥ쥯ȥˤк
 2 ǥ쥯ȥˤȤʤ롣)
λˤ
.B \-N
ץȤ

ŤۤΥǥ쥯ȥ礭ʥե뤬äơ
ۤˤϤʤ硢
.BR \-N " ץ "  \-P
ץѤȥѥå礭򾮤Ǥ롣
.BR \-P " ץ " \-N
ץȻƤ뤬 2 ǥ쥯ȥˤեƤ
Ϥ 1 ǥ쥯ȥˤե̵뤹
(ʤɲä줿ե򰷤)
ơѥåƤ˾õ줿ե褦
ѥåƬ˥ѥåƤ桼ؤλؼ񤯡

ǥ쥯ȥӻΥե̵뤵ˤϡ
.BI \-x  " PATTERN"
ץѤ롣Ȥϰۤʤꡢե̾ƬΥԥꥪɤϡ
ѥƬΥ磻ɥɤ˥ޥå롣
ˤäŸʤ褦
.I PATTERN
ϥȵǰϤ٤Ǥ롣
㤨 `\-x '*.[ao]''  `.a'  `.o'
ǽ̾Υե򤹤٤̵뤹롣
ΥץϡʣꤹȤ줾줬ͭˤʤ롣
㤨 `\-x 'RCS' \-x '*,v'' Ȥץꤹȡ
ե̾ `RCS' ä `*,v' ǽ褦
եȥ֥ǥ쥯ȥ򤹤٤̵뤹롣
.SH ֤
.B diff
ϰʲͤΤɤ줫ǽλ:
.TP
.B 0
ѹʤä
.TP
.B 1
ѹä
.TP
.B 2
餫Υ顼ä
.SH Ϣ
.BR cmp (1),
.BR comm (1),
.BR diff3 (1),
.BR ed (1),
.BR patch (1),
.BR pr (1),
.BR sdiff (1)
.SH 
ץΥХˤĤƤ bug-gnu-utils@gnu.org 𤷤Ƥ
ڡι Ragnar Hojland Espinosa
<ragnar@ragnar-hojland.com> ԤäƤޤ