Date: Sun, 14 Apr 2002 21:00:14 +1200 (New Zealand Standard Time) From: Juha Saarinen <juha@saarinen.org> To: "Crist J. Clark" <cjc@FreeBSD.ORG> Cc: "David W. Chapman Jr." <dwcjr@inethouston.net>, Matthias Andree <matthias.andree@gmx.de>, "freebsd-stable@freebsd.org" <freebsd-stable@FreeBSD.ORG> Subject: Re: "Unknown user: smmsp" Message-ID: <Pine.WNT.4.43.0204142054370.3044-100000@den2> In-Reply-To: <20020414010439.H43915@blossom.cjclark.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 [-scrvahi] [-m /path]
[-t /path] [-d] [-u N] [-w N] [-D /path]
Options:
-s Strict comparison (diff every pair of files)
-c Use context diff instead of unified diff
-r Re-run on a previously cleaned directory (skip temproot creation)
-v Be more verbose about the process, include additional checks
-a Leave all files that differ to merge by hand
-h Display more complete help
-i Automatically install files that do not exist in destination
directory
-m /path/directory Specify location of source to do the make in
-t /path/directory Specify temp root directory
-d Add date and time to directory name (e.g.,
/var/tmp/temproot.0414.21.16)
-u N Specify a numeric umask
-w N Specify a screen width in columns to sdiff
-D /path/directory Specify the destination directory to install files
to
--
Juha Saarinen
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.WNT.4.43.0204142054370.3044-100000>