Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Sep 2004 00:37:24 +0200
From:      des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
To:        Ben Mesander <ben@timing.com>
Cc:        freebsd-arch@freebsd.org
Subject:   Re: diff(1)
Message-ID:  <xzpsm9g8qu3.fsf@dwp.des.no>
In-Reply-To: <16715.25678.610402.410860@piglet.timing.com> (Ben Mesander's message of "Fri, 17 Sep 2004 16:25:18 -0600")
References:  <16715.4611.108597.354107@piglet.timing.com> <p06110428bd70ee3b2bfa@[128.113.24.47]> <414B40B0.5030809@sitetronics.com> <16715.25678.610402.410860@piglet.timing.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Ben Mesander <ben@timing.com> writes:
> I'm a long time UNIX user and have never used sdiff, but I suppose
> it's more than likely that everyone else on this mailing list uses
> it every day (some law about the perversity of the universe tending
> towards a maximum).

mergemaster(8) uses sdiff(1) to merge modified files.

DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpsm9g8qu3.fsf>