Date: Fri, 5 Apr 2002 18:23:47 +0100 From: Ben Smithurst <ben@FreeBSD.org> To: Brandon S Allbery KF8NH <allbery@ece.cmu.edu> Cc: James Long <stable@ns.museum.rain.com>, freebsd-stable@FreeBSD.org Subject: Re: mergemaster: what if I want both left and right? Message-ID: <20020405182347.H86069@strontium.shef.vinosystems.com> In-Reply-To: <1018026874.3914.1.camel@pyanfar.ece.cmu.edu> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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. :-(
--
Ben Smithurst / ben@FreeBSD.org FreeBSD: The Power To Serve
http://www.FreeBSD.org/
[-- Attachment #2 --]
-----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020405182347.H86069>