| mergemaster.8 (148179) | mergemaster.8 (155309) |
|---|---|
| 1.\" Copyright (c) 1998-2003 Douglas Barton 2.\" All rights reserved. 3.\" 4.\" Redistribution and use in source and binary forms, with or without 5.\" modification, are permitted provided that the following conditions 6.\" are met: 7.\" 1. Redistributions of source code must retain the above copyright 8.\" notice, this list of conditions and the following disclaimer. --- 8 unchanged lines hidden (view full) --- 17.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 19.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23.\" SUCH DAMAGE. 24.\" | 1.\" Copyright (c) 1998-2003 Douglas Barton 2.\" All rights reserved. 3.\" 4.\" Redistribution and use in source and binary forms, with or without 5.\" modification, are permitted provided that the following conditions 6.\" are met: 7.\" 1. Redistributions of source code must retain the above copyright 8.\" notice, this list of conditions and the following disclaimer. --- 8 unchanged lines hidden (view full) --- 17.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 19.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23.\" SUCH DAMAGE. 24.\" |
| 25.\" $FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 148179 2005-07-20 12:50:49Z keramida $ | 25.\" $FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 155309 2006-02-04 18:24:06Z rwatson $ |
| 26.\" | 26.\" |
| 27.Dd February 5, 2001 | 27.Dd February 4, 2006 |
| 28.Dt MERGEMASTER 8 29.Os 30.Sh NAME 31.Nm mergemaster 32.Nd merge configuration files, et al during an upgrade 33.Sh SYNOPSIS 34.Nm 35.Op Fl scrvahipCP 36.Op Fl m Ar /path/to/sources 37.Op Fl t Ar /path/to/temp/root 38.Op Fl d 39.Op Fl u Ar N 40.Op Fl w Ar N | 28.Dt MERGEMASTER 8 29.Os 30.Sh NAME 31.Nm mergemaster 32.Nd merge configuration files, et al during an upgrade 33.Sh SYNOPSIS 34.Nm 35.Op Fl scrvahipCP 36.Op Fl m Ar /path/to/sources 37.Op Fl t Ar /path/to/temp/root 38.Op Fl d 39.Op Fl u Ar N 40.Op Fl w Ar N |
| 41.Op Fl A Ar architecture |
|
| 41.Op Fl D Ar /path 42.Sh DESCRIPTION 43The 44.Nm 45utility is a Bourne shell script which is designed to aid you 46in updating the various configuration and other files 47associated with 48.Fx . --- 181 unchanged lines hidden (view full) --- 230.It Fl u Ar N 231Specify a numeric umask. 232The default is 022. 233.It Fl w Ar N 234Supply an alternate screen width to the 235.Xr sdiff 1 236command in numbers of columns. 237The default is 80. | 42.Op Fl D Ar /path 43.Sh DESCRIPTION 44The 45.Nm 46utility is a Bourne shell script which is designed to aid you 47in updating the various configuration and other files 48associated with 49.Fx . --- 181 unchanged lines hidden (view full) --- 231.It Fl u Ar N 232Specify a numeric umask. 233The default is 022. 234.It Fl w Ar N 235Supply an alternate screen width to the 236.Xr sdiff 1 237command in numbers of columns. 238The default is 80. |
| 239.It Fl A Ar architecture 240Specify an alternative 241.Ev TARGET_ARCH 242architecture name. |
|
| 238.It Fl D Ar /path 239Specify the destination directory for the installed files. 240.El 241.Sh ENVIRONMENT 242The 243.Nm 244utility uses the 245.Ev PAGER --- 162 unchanged lines hidden --- | 243.It Fl D Ar /path 244Specify the destination directory for the installed files. 245.El 246.Sh ENVIRONMENT 247The 248.Nm 249utility uses the 250.Ev PAGER --- 162 unchanged lines hidden --- |