.\" 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 diff3 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>
.\"
.\"WORD:	overlapping (changes)	ʣƤ (ѹ)
.\"
.TH DIFF3 1 "October 2002" "GNU diff Utilities 2.8.1"
.SH ̾
diff3 \- 3 ĤΥե֤ˤ㤤õ
.SH 
.B diff3
[\fB\-3aeimxAETX\fP] [\fB-L\fP \fILABEL\fR] [\fB\-\-easy\-only\fP] [\fB\-\-ed\fP]
[\fB\-\-initial\-tab\fR] [\fB\-\-label=\fILABEL\fR] [\fB\-\-merge\fP]
[\fB\-\-overlap\-only\fP] [\fB\-\-show\-all\fP] [\fB\-\-show\-overlap\fP]
[\fB\-\-text\fP] \fIMINE OLDER YOUR

.B diff3
[\fB\-v\fP] [\fB\-\-help\fP] [\fB\-\-version\fP]
.SH 
.B diff3
 3 ĤΥեӤΰ㤤Ϥ롣

оݤȤʤե
.IR MINE ", " OLDER ", " YOURS
Ǥ롣黰ĤΥեΤΰĤ
.RB ` \- '
ȤƤ褯ξ礽ΥեɸϤɤ߹ޤ롣

̾
.B diff3
ϼʬκȤΤ
.B diff
ư롣
.B BDIFF
Ķѿ¾ΥץꤹС
ΥץȤ褦ѹǤ롣
.SH ץ
.TP
.B \-3, \-\-easy\-only
.B \-e
ȻƤ뤬ʣƤʤѹʬϤ롣
.TP
.B \-a, \-\-text
ե뤬ƥȤˤϸʤ褦ʾǤ⡢
ƤΥեƥȤȤߤʤ 1 ԤӤԤ
.TP
.B \-e, \-\-ed
.I OLDER

.I YOURS
ؤΤ٤Ƥѹ
.I MINE
˥ޡ褦
.I ed
ץȤ롣
.TP
.B \-i
System V ߴΤˡ
.B ed
ץȤ
.RB ` w "' ޥɤ `" q '
ޥɤ롣Υץ
.B \-AeExX3
Τ줫ΥץȶѤʤФʤʤޤ
.B \-m
Ʊ˻ꤹ뤳ȤϤǤʤ
.TP
.B \-m, -\-merge
ed ץȤ 1 ܤΥեŬѤη̤ɸϤ롣
.B diff3
νϤ
.B ed
ΤȰۤʤꡢ
ΥץưϥХʥեԤƤʤԤˤŬѤǤ롣
ed ץȤΥץ󤬲ꤵʤС
.B \-A
ۤΤ˻ꤹ롣
.TP
.B \-x, \-\-overlap\-only
.B \-e
ȻƤ뤬ʣƤѹϤۤʤ롣
.TP
.B \-A, \-\-show\-all
.I OLDER

.I YOURS
ؤƤѹ
.I MINE
˥ޡ롣ʣƤѹϥ֥饱åȹԤǰϤäƽϤ롣
.TP
.B \-E, \-\-show\-overlap
.\"nakano: ϸʸְ㤤 -E νϤʲǤ롣
.B \-e
ȻƤ뤬ʣʬΥ֥饱åȹԤ 1 3 Ԥۤʤ롣
.B \-E
ǤϽʣƤѹϰʲΤ褦ˤʤ롣
.sp
.nf
<<<<<<< \fIMINE\fP
lines from \fIMINE\fP
=======
lines from \fIYOURS\fP
>>>>>>> \fIYOURS\fP
.fi
.TP
.BI "\-L " LABEL ", \-\-label=" LABEL
.BR \-A ", " \-E ", " \-X
ץΥ֥饱åȹԤˡ٥
.I LABEL
Ѥ롣ΥץϤ줾ϥեб
3 ĤޤͿ뤳ȤǤ롣
ǥեȤΥ٥ϥեΥե̾Ǥ롣ä
.B "diff3 \-L X \-L Y \-L Z \-m A B C"

.B "diff3 \-m A B C"
Ʊ褦ư뤬
Ϥ
.BR A ", " B ", " C
ǤϤʤ
.BR X ", " Y ", " Z
ΤΤǤ뤫Τ褦ʽϤȤʤ롣
.TP
.B \-T, \-\-initial\-tab
.TP
.B \-X
\fB\-E\fP ȻƤ뤬ʣƤѹϤۤʤ롣
̤θ򤹤С \fB\-x\fP ȻƤ뤬
\fB\-E\fP Τ褦ѹ֥饱åȹԤǰϤۤʤ롣
.TP
.B "\-\-help"
ɸϤ˻ˡΥåϤｪλ롣
.TP
.B \-v, \-\-version
.B diff3
ΥСֹϤ롣
.SH Ϸ
줾 hunk (㤤ɽƥȥ֥å) 
`\fB====\fP' ȤԤϤޤ롣 3 եȤۤʤ hunk Ǥ
 `\fB====\fP' Ȥʤꡢ 1 ե뤬ۤʤäƤ hunk Ǥ
.RB ` 1 "', `" 2 "', `" 3 '
Τ줫ΰۤʤäƤե򼨤ղä롣
hunk ˤ 2 ġޤ 3 ĤϹԤΥåȤޤޤ졢
줾˹ԥåȤɤΥեͳΤΤ򼨤
1 Ĥޤ 2 ĤΥޥɤ֤롣
ǥեȤưǤϡϹԤˤ 2 ĤΥڡ֤졢
ޥɤȶ̤Ǥ褦ˤʤäƤ롣
.B \-T
ꤵȡ˥֤ѤΤǡ
Ϥˤä֤ˤ·¸롣
.SS ޥɷ
.TP
.IB FILE : L a
 hunk 
.IR FILE "  " L
԰ʹߤ˸٤ΤǡΥեˤ¸ߤƤʤ
Υե¾ΥեƱˤˤϡ
¾ιԤ hunk ιԤɲäʤФʤʤ㤨
`1:11a' ϡ hunk ϥե 1  11 ܰʹߤɲä٤Τǡ
ե 1 ˤϴޤޤƤʤȼ
.TP
.IB FILE : R c
 hunk ˤϡ
.IR FILE " ιϰ " R
ޤޤƤ롣ϰ \fIR\fP  2 Ĥιֹ򥳥ޤǶڤäΤǤ롣
Ĥä 1 ԤϰϤȲᤵ롣
ΥեԽ¾ΥեƱˤˤϡ
ιϰϤ¾Υե뤫ȤäƤѹʤФʤʤ
㤨 `2:11,13c' ϡ hunk  2 ܤΥե
1113 ܤȤäƤΤǤ뤳Ȥ򼨤
.sp
ϹԥåȤκǸιԤԤǽäƤʤϡ
ϤμιԤ `\fB\\\fP' ǻϤޤΤǡԤǽäƤȶ̤Ǥ롣
.\"nakano: ưǧϤƤʤ(^^;
.SH ֤
.B diff3
ϰʲΤɤ줫ͤǽλ:
.TP
.B 0
.B diff3
ʣƤѹ () ¸ߤʤä
.TP
.B 1
ʣդä
.TP
.B 2
餫Υ顼ä
.SH Ϣ
.BR cmp (1),
.BR comm (1),
.BR diff (1),
.BR ed (1),
.BR patch (1),
.BR sdiff (1),
.SH 
ץΥХˤĤƤ bug-gnu-utils@gnu.org 𤷤Ƥ
ڡι Ragnar Hojland Espinosa <ragnar@ragnar-hojland.com> ԤäƤޤ