| mergemaster.8 (155309) | mergemaster.8 (158149) |
|---|---|
| 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 155309 2006-02-04 18:24:06Z rwatson $ | 25.\" $FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 158149 2006-04-29 18:21:43Z gordon $ |
| 26.\" 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 --- 203 unchanged lines hidden (view full) --- 237command in numbers of columns. 238The default is 80. 239.It Fl A Ar architecture 240Specify an alternative 241.Ev TARGET_ARCH 242architecture name. 243.It Fl D Ar /path 244Specify the destination directory for the installed files. | 26.\" 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 --- 203 unchanged lines hidden (view full) --- 237command in numbers of columns. 238The default is 80. 239.It Fl A Ar architecture 240Specify an alternative 241.Ev TARGET_ARCH 242architecture name. 243.It Fl D Ar /path 244Specify the destination directory for the installed files. |
| 245.It Fl U 246Attempt to auto upgrade files that have not been user modified. |
|
| 245.El 246.Sh ENVIRONMENT 247The 248.Nm 249utility uses the 250.Ev PAGER 251environment variable if set. 252Otherwise it uses --- 160 unchanged lines hidden --- | 247.El 248.Sh ENVIRONMENT 249The 250.Nm 251utility uses the 252.Ev PAGER 253environment variable if set. 254Otherwise it uses --- 160 unchanged lines hidden --- |