On Thu, Mar 20, 2003 at 10:15:48PM -0600, Brandon D. Valentine wrote: >I have encountered a situation in which it would be extremely handy to >have a generalized version of mergemaster(8) which is less specific to >the task of merging /etc. I need to recursively merge two directories >of source files in which I wish to preserve some original files, install >some replacement files outright, and only actually go to the trouble of >sdiff(1)ing those files that from the preview udiff look like they are >need of a merge.
Have you considered emacs ediff-directories? It might be better suited than mergemaster for handling arbitrary directories. Peter To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-hackers" in the body of the message