From owner-freebsd-stable Fri Apr 5 9:23:58 2002 Delivered-To: freebsd-stable@freebsd.org Received: from scientia.demon.co.uk (scientia.demon.co.uk [212.228.14.13]) by hub.freebsd.org (Postfix) with ESMTP id B1A8237B41C for ; Fri, 5 Apr 2002 09:23:49 -0800 (PST) Received: from strontium.shef.vinosystems.com ([192.168.91.36] ident=ben) by scientia.demon.co.uk with smtp (Exim 3.30 #1) id 16tXRD-0009w2-00; Fri, 05 Apr 2002 18:23:47 +0100 Date: Fri, 5 Apr 2002 18:23:47 +0100 From: Ben Smithurst To: Brandon S Allbery KF8NH Cc: James Long , freebsd-stable@FreeBSD.org Subject: Re: mergemaster: what if I want both left and right? Message-ID: <20020405182347.H86069@strontium.shef.vinosystems.com> References: <20020404232831.A95052@ns.museum.rain.com> <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> <20020405160940.F86069@strontium.shef.vinosystems.com> <1018026874.3914.1.camel@pyanfar.ece.cmu.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="4vgOdmpzXGVCiUly" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <1018026874.3914.1.camel@pyanfar.ece.cmu.edu> X-PGP-Key: http://www.smithurst.org/ben/pgp-key.txt Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --4vgOdmpzXGVCiUly Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Brandon S Allbery KF8NH wrote: > Hm. I had just done a mergemaster run which involved using "e b" to > integrate changes to /etc/inetd.conf, and it worked fine for me.... I think it's because my editor (vim) must be not writing the file in place (i.e. it does unlink then creates a new file, or something). The patch is simple enough but sdiff is vendor code. :-( --=20 Ben Smithurst / ben@FreeBSD.org FreeBSD: The Power To Serve http://www.FreeBSD.org/ --4vgOdmpzXGVCiUly Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE8rd2jbPzJ+yzvRCwRAun4AJ0b9WLfCZGuaFO99Bw0ev60+V3WqQCeJago PNLdKsXYTZxg6LOR4pYovmw= =mZXb -----END PGP SIGNATURE----- --4vgOdmpzXGVCiUly-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message