From owner-FreeBSD-users-jp@jp.FreeBSD.org Wed May  1 19:51:40 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g41ApeD45046;
	Wed, 1 May 2002 19:51:40 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from localhost (localhost [::1])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet6 id g41Apef45039
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Wed, 1 May 2002 19:51:40 +0900 (JST)
	(envelope-from matusita@jp.FreeBSD.org)
In-Reply-To: <80u1psf99z.fsf@kurishna.tri.asanuma.co.jp>
References: <20020501191024P.matusita@jp.FreeBSD.org>
	<20020501191024P.matusita@jp.FreeBSD.org>
	<80u1psf99z.fsf@kurishna.tri.asanuma.co.jp>
X-User-Agent: Mew/1.94.2 XEmacs/21.5 (bamboo)
X-FaceAnim: (-O_O-)(O_O- )(_O-  )(O-   )(-   -)(   -O)(  -O_)( -O_O)(-O_O-)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
X-Dispatcher: imput version 20000228(IM140)
Lines: 14
From: Makoto Matsushita <matusita@jp.FreeBSD.org>
To: FreeBSD-users-jp@jp.FreeBSD.org
Date: Wed, 01 May 2002 19:51:38 +0900
Message-Id: <20020501195138T.matusita@jp.FreeBSD.org>
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: FreeBSD-users-jp 68312
Subject: [FreeBSD-users-jp 68312] Re: stable
 =?ISO-2022-JP?B?GyRCJD0kTjhlGyhC?= 
Errors-To: owner-FreeBSD-users-jp@jp.FreeBSD.org
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: matusita@jp.FreeBSD.org


mori> $B$3$N0lE@!V$@$1!W$K8B$l$P0-$$$N$O(B mergemaster(8) $B$8$c$J$/(B 
mori> sdiff(1) $B$G$9$h$M!#(B

$B$b$A$m$s$=$&$G$9$,!$(Bsdiff $B$r!V;H$o$J$1$l$P$J$i$J$$!W$o$1$G$O$J$$$N$G!$(B
$B$d$C$Q$j(B(sdiff $B$r;H$C$F$$$k(B) mergemaster $B$NLdBj!$$H$$$C$F$bNI$$$h$&$J(B
$B5$$O$7$^$9!%(B

sdiff $B$HEy2A$J=hM}$r(B shell script $B$G$,$7$,$7=q$/!$$H$$$&$N$O!V$d$l$P$G(B
$B$-$k!WDxEY$NOC$G$9$h$M(B:)

-- -
Makoto `MAR' Matsushita
$B$d$l$P$G$-$kOC$H$$$&$N$O$d$i$J$$$H$G$-$J$$OC$G$b$"$k(B($B$"$?$j$^$((B)
