Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Apr 2002 22:17:17 -0600
From:      Glenn Johnson <glennpj@charter.net>
To:        Ben Smithurst <ben@FreeBSD.ORG>
Cc:        Brandon S Allbery KF8NH <allbery@ece.cmu.edu>, James Long <stable@ns.museum.rain.com>, freebsd-stable@FreeBSD.ORG
Subject:   Re: mergemaster: what if I want both left and right?
Message-ID:  <20020406041717.GA992@gforce.johnson.home>
In-Reply-To: <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> <20020405182347.H86069@strontium.shef.vinosystems.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Apr 05, 2002 at 06:23:47PM +0100, Ben Smithurst wrote:

> 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. :-(

I typically use vim as my editor but I ran into this same problem. What
I do when I use mergemaster or sdiff is do an 'env EDITOR=vi' first, ie.
'env EDITOR=vi mergemaster'.

-- 
Glenn Johnson
glennpj@charter.net

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?20020406041717.GA992>