In doing some merges lately, I've gotten into situations where mergemaster gives me a choice between old lines I want to keep on the left, and new lines which I want to add on the right. A specific example was in merging my /etc/group and /etc/passwd files, I had the choice between some existing groups which I need to retain on the left, and some newly-added system groups which I want to incorporate, on the right.
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. To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
