svn: head/usr.sbin/mergemaster

Garrett Wollman wollman at
Fri Jan 2 22:52:08 UTC 2009

<<On Fri, 02 Jan 2009 14:15:20 -0800, Doug Barton <dougb at> said:

> As I said in my first post, if there is overwhelming demand for this
> down the road that is not met by the existing solutions I'll consider
> adding a better implementation as an option, off by default.

It would be much better if the options that *nearly every user will
want to use* are set correctly by default.  I have to look at the man
page every time I update a system to remind myself what is that magic
option that makes mergemaster do the right thing with files I haven't


More information about the svn-src-head mailing list