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) | [EMAIL PROTECTED] Unix Systems Administrator | [EMAIL PROTECTED] 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 [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
