On Sun, 14 Apr 2002, Crist J. Clark wrote:
> # mergemaster -p
>
>
> Was added just for this.
Thanks -- could this be documented in UPDATING?
Which version of mergemaster supports -p? The one I have (4.3-STABLE)
doesn't:
$ mergemaster -p
mergemaster version 1.6.2.10
Usage: mergemaster [-scrva
On Sun, Apr 14, 2002 at 03:17:12PM +1200, Juha Saarinen wrote:
> On Sat, 13 Apr 2002, David W. Chapman Jr. wrote:
>
> > I don't know if its fixed, but another problem is when you try to use
> > mergemaster it used to fail because that user couldn't be found, most
> > likely due to mtree, IIRC.
On Sat, Apr 13, 2002 at 11:10:18PM -0600, M. Warner Losh wrote:
> In message: <[EMAIL PROTECTED]>
> Nevermind <[EMAIL PROTECTED]> writes:
> : Hello, Crist J. Clark!
> :
> : On Tue, Apr 02, 2002 at 03:22:52PM -0800, you wrote:
> :
> : > > mtree -deU -f /usr/src/etc/mtree/BSD.var.dist
