From owner-man-jp@jp.freebsd.org  Wed Dec 17 12:57:21 1997
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta7/8.7.3) id MAA21363
	Wed, 17 Dec 1997 12:57:21 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta7/8.7.3) with ESMTP id MAA21273
	for <man-jp@jp.freebsd.org>; Wed, 17 Dec 1997 12:56:15 +0900 (JST)
Received: from robo1.mech.eng.osaka-u.ac.jp (robo1 [133.1.207.216]) by ams-srv.ams.eng.osaka-u.ac.jp (8.8.8/3.5Wpl4) with SMTP id MAA04339 for <man-jp@jp.freebsd.org>; Wed, 17 Dec 1997 12:49:59 +0900 (JST)
Received: from asahi.ams.eng.osaka-u.ac.jp (asahi [133.1.207.250]) by robo1.mech.eng.osaka-u.ac.jp (8.6.12+2.5Wb7/3.5Wpl4-for-MECH-subdomain-nomx) with ESMTP id MAA02482 for <man-jp@jp.freebsd.org>; Wed, 17 Dec 1997 12:52:48 +0900
Message-Id: <199712170352.MAA02482@robo1.mech.eng.osaka-u.ac.jp>
To: man-jp@jp.freebsd.org
From: MITSUNAGA Noriaki <mitchy@er.ams.eng.osaka-u.ac.jp>
In-Reply-To: Your message of "Wed, 17 Dec 1997 12:41:34 +0900"
References: <199712170342.MAA29482@isrdgw.isrd.hitachi.co.jp>
X-Mailer: Mew version 1.70 on Emacs 19.28.1 / Mule 2.3
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Date: Wed, 17 Dec 1997 12:53:24 +0900
Reply-To: man-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=24]
X-Sequence: man-jp 480
Subject: [man-jp 480] Re: [ports-jp 2266] ja-groff-0.99 change request 
Errors-To: owner-man-jp@jp.freebsd.org
Sender: owner-man-jp@jp.freebsd.org

From: Kazuo HORIKAWA <horikawa@isrd.hitachi.co.jp>
Subject: [man-jp 479] Re: [ports-jp 2266] ja-groff-0.99 change request 


> > 2.2.5-RELEASE$B$N(Bman$B$H(Bjp-man-1.1(jp-man-doc-2.2.1)$B$G$b$J$j$^$9!#(B

>  $B:#!"(BFreeBSD $B%^%7%s$,<j85$K$J$$$N$G;n$;$J$$$N$G$9$,!"=PNO7k2L$O6qBNE*(B
> $B$K$I$&$J$j$^$9!)(B

man rcsmerge$B$@$H!"(B
EXAMPLES
       Suppose  you  have  released  revision 2.8 of f.c.  Assume
       furthermore that after you complete an unreleased revision
       3.4, you receive updates to release 2.8 from someone else.
       To combine the updates to 2.8 and your changes between 2.8
       and 3.4, put the updates to 2.8 into file f.c and execute

           rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c

       Then  examine  f.merged.c.   Alternatively, if you want to

jman rcsmerge$B$@$H!"(B
$BNc(B
       $B$9$G$K%j%j!<%9$7$?%j%S%8%g%s(B 2.8 $B$N(B f.c $B$H$$$&%U%!%$%k$,$"(B
       $B$k(B $B$H(B $B$7$^$9!#$3$3$G!"$^$@%j%j!<%9$7$F$$$J$$%j%S%8%g%s(B 3.4
       $B$,40@.$7$?$H$-$K!"B>?M$+$i(B 2.8 $B$r2~NI$7$?$b$N$r<u$1$H$C(B $B$?(B
       $B$H$7$^$9!#$3$N2~NI$H!"$"$J$?$,(B 2.8 $B$+$i(B 3.4 $B$N4V$K9T$C$?JQ(B
       $B99$rJ;9g$9$k$K$O<!$N$h$&$K$7$^$9!#(B

       rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c

       $B$3$3$G!"J;9g$5$l$?(B f.merged.c $B$r8!::$7$^$9!#$b$7!"(B2.8 $B$KBP(B
$B$G$9!#(B

> % $BI=<($,!{!{$K$J$k$N$G$9$,!D$HJs9p$$$?$@$1$k>l9g!"(B
> % $B$G$-$l$P$3$l$+$i$O(B groff -mandoc -Tnippon $B$N=PNO7k2L$b(B
> % $B%+%C%H%"%s%I%Z!<%9%H$7$F$$$?$@$-$?$$$G$9!#(B

zcat /usr/share/man/man1/rcsmerge.1.gz | groff -mandoc -Tnippon | less
$B$@$H!"(B
EXAMPLES
       Suppose  you  have  released  revision 2.8 of f.c.  Assume
       furthermore that after you complete an unreleased revision
       3.4, you receive updates to release 2.8 from someone else.
       To combine the updates to 2.8 and your changes between 2.8
       and 3.4, put the updates to 2.8 into file f.c and execute

           rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c

       Then  examine  f.merged.c.   Alternatively, if you want to
$B$G$9!#(Bman$B$HF1$87k2L$G$9!#(B

// $B$_$D$J$,(B $B$N$j$"$-(B //
