Date: 05 Apr 2002 02:35:58 -0500 From: "Brandon S. Allbery " KF8NH <allbery@ece.cmu.edu> To: James Long <stable@ns.museum.rain.com> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster: what if I want both left and right? Message-ID: <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> In-Reply-To: <20020404232831.A95052@ns.museum.rain.com> References: <20020404232831.A95052@ns.museum.rain.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1017992158.15333.11.camel>