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
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
|
.\" $FreeBSD: doc/ja_JP.eucJP/man/man1/rcsmerge.1,v 1.6 2001/05/14 01:07:28 horikawa Exp $
.de Id
.ds Rv \\$3
.ds Dt \\$4
..
.Id %FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.5 1999/08/27 23:36:58 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
.TH RCSMERGE 1 \*(Dt GNU
.SH ̾
rcsmerge \- RCS եΥӥʻ礹
.SH
.B rcsmerge
.RI [ options ] " file"
.SH
.B rcsmerge
\*r 2 ĤΥӥ֤ѹбեŬѤޤ
.PP
\*r ĥҤ˥ޥåѥ̾ \*r եǤȤߤʤ
¾ϥեǤȤߤʤޤ
̾бˤĤƤ
.BR ci (1)
ȤƤ
.PP
Ҥ륪ץ(̾
.B -r
)ˤäơʤȤ1ĤΥӥꤹɬפޤ
2 ĤΥӥꤹ뤳ȤǤޤ
1 ĤΥӥΤߤꤵ줿硢⤦1ĤΥӥȤơ
ǥեȻ(̾ϴǺֹĻ) κǿӥѤޤ
ӥϡޤϥܥǻǤޤ
.PP
⤷ʣȯȡ
.B rcsmerge
Ϸٹåɽʣΰ
.BR merge (1)
Ƥ褦ʷǽϤޤ
ܥޥɤϥåȤӥ˰ϢѹäΤǤ
.SH ץ
.TP
.B \-A
⤷ݡȤƤС
.BR diff3 (1)
.B \-A
̷Ϥޤ
.I file2
.I file3
ؤѹƤ
.IR file1
ŬѤѾܺ٤ʾϤޤ
.TP
\f3\-E\fP, \f3\-e\fP
ϡ
.BR \-A
̤ʤ̷Ϥ륹ꤹΤǤ
ܺ٤
.BR diff3 (1)
ȤƲ
ǥեȤ
.BR \-E
Ǥ
.BR \-e
ꤹȡ
.B rcsmerge
̷ηٹԤʤޤ
.TP
.BI \-k subst
ִˤơ
.I subst
ǻꤵ줿Ѥޤܺ٤
.BR co (1)
ȤƤ㤨С
.B "\-kk\ \-r1.1\ \-r1.2"
.B 1.1
.B 1.2
ؤѹʻ礹ݤˡɤΰ㤤̵뤷ޤ
ХʥեƥȤǤ뤫Τ褦˥ӥʻ礹뤳Ȥϡ̡
̣ޤ
Ǥ
.B rcsmerge
.B \-kb
ꤵƤȥեΥӥʻԤʤޤ
.TP
.BR \-p [\f2rev\fP]
̤ե˾ˡɸϤ˽Фޤ
.TP
.BR \-q [\f2rev\fP]
Ťưޤǥåɽޤ
.TP
.BR \-r [\f2rev\fP]
ӥ
.I rev
˴ؤʻԤޤ
.I rev
ꤷʤϡǥեȻޤκǿӥ(̾Ƭ)Ѥޤ
.TP
.B \-T
Υץϰ̣ޤ
¾ \*r ޥɤȤθߴΤ¸ߤޤ
.TP
.BI \-V
\*r ΥСֹɽޤ
.TP
.BI \-V n
\*r ƥΥС
.I n
Υߥ졼Ԥޤܺ٤
.BR co (1)
ȤƤ
.TP
.BI \-x "suffixes"
\*r եĥҤ
.I suffixes
Ȥޤܤ
.BR ci (1)
ȤƤ
.TP
.BI \-z zone
ִΥॾ
.I zone
Ȥޤܤ
.BR co (1)
ȤƤ
.SH
Ǥ˥ӥ 2.8
.B f.c
Ȥե뤬Ȥޤ
ǡޤƤʤӥ 3.4 Ȥˡ
¾ͤ 2.8 ɤΤȤäȤޤ
βɤȡʤ 2.8 3.4 δ֤˹Ԥäѹʻ礹ˤ
Τ褦ˤޤ
.LP
.B " rcsmerge \-p \-r2.8 \-r3.4 f.c >f.merged.c"
.PP
ǡʻ礵줿
.B f.merged.c
ޤ
⤷2.8 Ф빹ʬ \*r ե¸Ƥȹͤʤ顢
2.8.1.1 Ȥӥǥåθ
.BR "co \-j"
¹Ԥޤ
.LP
.B " ci \-r2.8.1.1 f.c"
.br
.B " co \-r3.4 \-j2.8:2.8.1.1 f.c"
.PP
̤ȤơʲΥޥɤϥӥ 2.4 2.8 ؤѹǤ
åȤե
.B f.c
äޤ
.LP
.B " rcsmerge \-r2.8 \-r2.4 f.c"
.PP
ꤹӥֹν֤դƤޤ
.B f.c
뤳ȤˤդƤ
.SH Ķѿ
.TP
.B \s-1RCSINIT\s0
ޥɥ饤Ωäƻꤹ٤ץǶڤäƻꤷޤ
ܤ
.BR ci (1)
ȤƤ
.SH
ʻˤäƽʣʤнλơ 0 ʣ 1
꤬ȯ 2 ֤ޤ
.SH
Author: Walter F. Tichy.
.br
Manual Page Revision: \*(Rv; Release Date: \*(Dt.
.br
Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
.br
Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
.SH Ϣ
ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1),
rcsfile(5)
.br
Walter F. Tichy,
\*r\*-A System for Version Control,
.I "Software\*-Practice & Experience"
.BR 15 ,
7 (July 1985), 637-654.
.br
|
