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
|
.de Id
.ds Rv \\$3
.ds Dt \\$4
..
.Id $Id: rcsmerge.1,v 1.2 1993/07/24 03:11:32 jtc 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
2 ĤΥӥ֤ѹեŬѤޤ
.PP
\*r ĥҤ˥ޥåե̾ \*r եǤȤߤʤ¾
Υե̾ϥեǤȤߤʤޤ
.BR ci (1)
ȤƤ
.PP
Ҥ륪ץ(̾
.B -r
)ˤäơʤȤ1ĤΥӥ
ꤹɬפޤǡ2ĤΥӥꤹ뤳ȤǤޤ1Ĥ
ӥΤߤꤵ줿硢⤦1ĤΥӥȤơǥե
(̾ϴǺֹĻ)Ѥޤӥϡޤ
ܥǻǤޤ
.PP
⤷ʣȯȡ
.B rcsmerge
Ϸٹåɽʣΰ
.BR merge (1)
Ƥ褦ʷǽϤޤܥޥɤϼФ
ӥ˰ϢѹäΤǤ
.SH ץ
.TP
.BI \-k subst
ִˤơ
.I subst
ǻꤵ줿Ѥޤܺ٤
.BR co (1)
ȤƤ㤨С
.B "\-kk\ \-r1.1\ \-r1.2"
.B 1.1
.B 1.2
ؤѹʻ礹ݤˡɤΰ㤤̵뤷ޤ
.TP
.BR \-p [\f2rev\fP]
̤ե˾ˡɸϤ˽Фޤ
.TP
.BR \-q [\f2rev\fP]
̵ưޤǥåɽޤ
.TP
.BR \-r [\f2rev\fP]
ӥ
.I rev
ͤʻԤޤ
.I rev
ꤷʤϡǥե
ȻޤκǿӥѤޤ
.TP
.BI \-V n
\*r ƥΥС
.I n
Υߥ졼Ԥޤܺ٤
.BR co (1)
ȤƤ
.TP
.BI \-x "suffixes"
\*r եĥҤꤷޤܤ
.BR ci (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
Ǥޤ
.PP
⤷¾ͤɤΤ \*r ե¸Ƥȹͤ
顢 2.8.1.1 ȤӥϿθ
.B co
.B \-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
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 Ϣ
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
|