Date: Fri, 2 Jan 2009 17:18:09 -0500 From: Garrett Wollman <wollman@bimajority.org> To: Doug Barton <dougb@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster Message-ID: <18782.37537.775290.682466@hergotha.csail.mit.edu> In-Reply-To: <495E91F8.3010706@FreeBSD.org> References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org> <495DC5AF.3050908@FreeBSD.org> <495E91F8.3010706@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
<<On Fri, 02 Jan 2009 14:15:20 -0800, Doug Barton <dougb@FreeBSD.org> 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 changed. -GAWollman
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18782.37537.775290.682466>