From owner-freebsd-stable Thu Apr 4 23:37:33 2002 Delivered-To: freebsd-stable@freebsd.org Received: from hilfy.ece.cmu.edu (HILFY.ECE.CMU.EDU [128.2.136.133]) by hub.freebsd.org (Postfix) with ESMTP id 3DE8137B41D for ; Thu, 4 Apr 2002 23:36:16 -0800 (PST) Received: from rushlight.kf8nh.apk.net (root@VPN59.ECE.CMU.EDU [128.2.138.59]) by hilfy.ece.cmu.edu (8.11.0/8.8.8) with ESMTP id g357ZwU11472; Fri, 5 Apr 2002 02:35:58 -0500 (EST) Received: (from allbery@localhost) by rushlight.kf8nh.apk.net (8.11.6/8.11.6) id g357Zwj20745; Fri, 5 Apr 2002 02:35:58 -0500 (EST) (envelope-from allbery@ece.cmu.edu) X-Authentication-Warning: rushlight.kf8nh.apk.net: allbery set sender to allbery@ece.cmu.edu using -f Subject: Re: mergemaster: what if I want both left and right? From: "Brandon S. Allbery " KF8NH To: James Long Cc: freebsd-stable@FreeBSD.ORG In-Reply-To: <20020404232831.A95052@ns.museum.rain.com> References: <20020404232831.A95052@ns.museum.rain.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Mailer: Evolution/1.0.2 Date: 05 Apr 2002 02:35:58 -0500 Message-Id: <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> Mime-Version: 1.0 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 On Fri, 2002-04-05 at 02:28, James Long wrote: > How can I tell mergemaster something like, "insert the left alternative > first, followed by the right alternative" or vice versa, right first, then > left? Must I just edit the file(s) manually? 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. > And I suppose if we're going to add some flavor of a 'both' option, it's > only a matter of time before a need for 'neither' arises. "e", then save the empty file. -- brandon s allbery [openafs/solaris/japh/freebsd] allbery@kf8nh.apk.net system administrator [linux/heimdal/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