From owner-freebsd-stable Fri Apr 5 9: 2:31 2002 Delivered-To: freebsd-stable@freebsd.org Received: from scientia.demon.co.uk (scientia.demon.co.uk [212.228.14.13]) by hub.freebsd.org (Postfix) with ESMTP id B299137B404 for ; Fri, 5 Apr 2002 09:02:23 -0800 (PST) Received: from strontium.shef.vinosystems.com ([192.168.91.36] ident=ben) by scientia.demon.co.uk with smtp (Exim 3.30 #1) id 16tVLR-000IoE-00; Fri, 05 Apr 2002 16:09:41 +0100 Date: Fri, 5 Apr 2002 16:09:41 +0100 From: Ben Smithurst To: "Brandon S. Allbery KF8NH" Cc: James Long , freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster: what if I want both left and right? Message-ID: <20020405160940.F86069@strontium.shef.vinosystems.com> References: <20020404232831.A95052@ns.museum.rain.com> <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="yZxAaITavNk3ADw/" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> X-PGP-Key: http://www.smithurst.org/ben/pgp-key.txt Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --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