From owner-freebsd-stable  Fri Apr  5  9:14:41 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from ece.cmu.edu (ECE.CMU.EDU [128.2.136.200])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3D3A337B417; Fri,  5 Apr 2002 09:14:35 -0800 (PST)
Received: from pyanfar.ece.cmu.edu (allbery@VPN28.ECE.CMU.EDU [128.2.138.28])
	(authenticated)
	by ece.cmu.edu (8.11.0/8.10.2) with ESMTP id g35HEWw21943;
	Fri, 5 Apr 2002 12:14:33 -0500 (EST)
Subject: Re: mergemaster: what if I want both left and right?
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
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>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Mailer: Evolution/1.0.2 
Date: 05 Apr 2002 12:14:29 -0500
Message-Id: <1018026874.3914.1.camel@pyanfar.ece.cmu.edu>
Mime-Version: 1.0
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

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