Date: Fri, 5 Apr 2002 16:09:41 +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: <20020405160940.F86069@strontium.shef.vinosystems.com> In-Reply-To: <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> References: <20020404232831.A95052@ns.museum.rain.com> <1017992158.15333.11.camel@rushlight.kf8nh.apk.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--yZxAaITavNk3ADw/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Brandon S. Allbery KF8NH wrote:
> mergemaster just uses "sdiff -o", so anything you can use there will
> 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...
--=20
Ben Smithurst / ben@FreeBSD.org FreeBSD: The Power To Serve
http://www.FreeBSD.org/
--yZxAaITavNk3ADw/
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
iD8DBQE8rb4zbPzJ+yzvRCwRAt0nAKDNMCHmFjJgNsB2AIAIEJy4erYUUwCgwmGl
DcUbeVtFgr+KumgZYlLAeww=
=KlZ8
-----END PGP SIGNATURE-----
--yZxAaITavNk3ADw/--
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?20020405160940.F86069>