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] [EMAIL PROTECTED] system administrator [linux/heimdal/too many hats] [EMAIL PROTECTED] electrical and computer engineering KF8NH carnegie mellon university [better check the oblivious first -ke6sls] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
