Date: Fri, 5 Apr 2002 01:37:11 -0600 From: "Matthew D. Fuller" <fullermd@over-yonder.net> 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: <20020405013711.B8609@over-yonder.net> In-Reply-To: <20020404232831.A95052@ns.museum.rain.com>; from stable@ns.museum.rain.com on Thu, Apr 04, 2002 at 11:28:31PM -0800 References: <20020404232831.A95052@ns.museum.rain.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Apr 04, 2002 at 11:28:31PM -0800 I heard the voice of James Long, and lo! it spake thus: > > 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? > > 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. Note that to be pedantic, you don't tell mergemaster any of the above; you tell sdiff(1). Unfortunately, the manpage is less than helpful. You need to worm your way INTO the program to see options: %? l: use the left version r: use the right version e l: edit then use the left version e r: edit then use the right version e b: edit then use the left and right versions concatenated e: edit a new version s: silently include common lines v: verbosely include common lines q: quit -- Matthew Fuller (MF4839) | fullermd@over-yonder.net Unix Systems Administrator | fullermd@futuresouth.com Specializing in FreeBSD | http://www.over-yonder.net/ "The only reason I'm burning my candle at both ends, is because I haven't figured out how to light the middle yet" 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?20020405013711.B8609>