Date: 05 Apr 2002 12:14:29 -0500 From: Brandon S Allbery KF8NH <allbery@ece.cmu.edu> To: Ben Smithurst <ben@FreeBSD.org> 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: <1018026874.3914.1.camel@pyanfar.ece.cmu.edu> In-Reply-To: <20020405160940.F86069@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>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 2002-04-05 at 10:09, Ben Smithurst wrote: > Brandon S. Allbery KF8NH wrote: > > work. In particular, you want "e b" which tosses you into the editor > > with both versions of the current chunk. > > Except that never works when I try it. :-( I end up getting the left and > right concatenated, regardless of any changes I make in the editor. One > day I'll try to work out why... 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.... -- brandon s. allbery [os/2][linux][solaris][japh] allbery@kf8nh.apk.net system administrator [WAY too many hats] allbery@ece.cmu.edu electrical and computer engineering KF8NH carnegie mellon university ["better check the oblivious first" -ke6sls] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1018026874.3914.1.camel>