1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
.de Id
.ds Rv \\$3
.ds Dt \\$4
..
.Id $Id: merge.1,v 1.2 1993/07/24 02:51:22 jtc Exp $
.TH MERGE 1 \*(Dt GNU
.SH ̾
merge \- 2ĤΥեκʬ̤ΥեŬѤ
.SH
.B merge
[
.B \-L
.I label1
[
.B \-L
.I label3
] ] [
.B \-p
] [
.B \-q
]
.I "file1 file2 file3"
.SH
.B merge
.I file2
.I file3
ؤѹΤ٤Ƥ
.I file1
ŬѤޤŬ
̤ϡ
.B \-p
ץꤵƤɸϤءʤ
.I file1
ؽϤޤ
.B merge
ϡΥեФ̡ѹԤ
˻ȤޤȤСΥե
.I file2
Фơ
.I file1
.I file3
Τɤ
.I file2
ѹΤȤ硢
.B merge
ξ
̤뤳Ȥˤʤޤ
.PP
.B merge
.I file1
.I file3
ƱʬФѹԤƤ硢
ʣΤޡԤޤ
.B diff3
ޥɤ
.B \-E
ץѤǤʤŤǤϡ
.B merge
ϤΤ褦ʽʣФ뤳ȤǤ
.I file3
ؤѹ̤
ߤĤꡢ
.I file1
ؤѹ̤˴ޤʳ¿ηǤϡʣȯȡ
.B merge
(⤷
.B \-q
ץꤵƤʤ
)λݤΥåɽξѹ̤ȤƻĤޤη̤ϡʲΤ褦ˤʤޤ
.LP
.RS
.nf
.BI <<<<<<< " file1"
.I "lines in file1"
.B "======="
.I "lines in file3"
.BI >>>>>>> " file3"
.RE
.fi
.LP
⤷ʣȯ顢桼ϽʣսԽʤФ
ޤץ
.BI \-L "\ label1"
.BI \-L " label3"
ꤵ줿ʤ顢Ϸ̤
.I file1
.I file3
ʬץǻꤷΤ֤ޤ
.SH
ʣȯʤнλơ 0 ʣȯ饹ơ
1 顼ȯ饹ơ 2 ֤ޤ
.SH
Author: Walter F. Tichy.
.br
Revision Number: \*(Rv; Release Date: \*(Dt.
.br
Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
.br
Copyright \(co 1990, 1991 by Paul Eggert.
.SH Ϣ
diff3(1), diff(1), rcsmerge(1), co(1).
|
