summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-01-18 20:02:45 +0000
committerru <ru@FreeBSD.org>2005-01-18 20:02:45 +0000
commitc05985f13f215ea0060080637a64b09c3cff6233 (patch)
treefcf95075ec47428572774cbb5d2f7bbdf690ed94 /usr.sbin/mergemaster
parent4c9a185523b963e32b04d8114b4b3f1e582b7c6f (diff)
downloadFreeBSD-src-c05985f13f215ea0060080637a64b09c3cff6233.zip
FreeBSD-src-c05985f13f215ea0060080637a64b09c3cff6233.tar.gz
Sort sections.
Diffstat (limited to 'usr.sbin/mergemaster')
-rw-r--r--usr.sbin/mergemaster/mergemaster.868
1 files changed, 34 insertions, 34 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 8cd8b25..4bac44f 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -264,29 +264,6 @@ Other variables that are used by the script internally
can be specified in
.Pa .mergemasterrc
as described in more detail below.
-.Sh EXAMPLES
-Typically all you will need to do is type
-.Nm
-at the prompt and the script will do all the work for you.
-.Pp
-To use context diff's and have
-.Nm
-explain more things as it goes along, use:
-.Pp
-.Dl # mergemaster -cv
-.Pp
-To specify that
-.Nm
-put the temporary root environment in
-.Pa /usr/tmp/root ,
-use:
-.Pp
-.Dl # mergemaster -t /usr/tmp/root
-.Pp
-To specify a 110 column screen with a strict
-comparison, use:
-.Pp
-.Dl # mergemaster -sw 110
.Sh FILES
.Bl -tag -width $HOME/.mergemasterrc -compact
.It Pa /etc/mergemaster.rc
@@ -359,6 +336,40 @@ with all values commented out:
#MM_PRE_COMPARE_SCRIPT=
#MM_EXIT_SCRIPT=
.Ed
+.Sh EXIT STATUS
+Exit status is 0 on successful completion, or if the user bails out
+manually at some point during execution.
+.Pp
+Exit status is 1 if it fails for one of the following reasons:
+.Pp
+Invalid command line option
+.Pp
+Failure to create the temporary root environment
+.Pp
+Failure to populate the temporary root
+.Sh EXAMPLES
+Typically all you will need to do is type
+.Nm
+at the prompt and the script will do all the work for you.
+.Pp
+To use context diff's and have
+.Nm
+explain more things as it goes along, use:
+.Pp
+.Dl # mergemaster -cv
+.Pp
+To specify that
+.Nm
+put the temporary root environment in
+.Pa /usr/tmp/root ,
+use:
+.Pp
+.Dl # mergemaster -t /usr/tmp/root
+.Pp
+To specify a 110 column screen with a strict
+comparison, use:
+.Pp
+.Dl # mergemaster -sw 110
.Sh SEE ALSO
.Xr cvs 1 ,
.Xr diff 1 ,
@@ -373,17 +384,6 @@ with all values commented out:
.%T The Cutting Edge (using make world)
.%A Nik Clayton
.Re
-.Sh EXIT STATUS
-Exit status is 0 on successful completion, or if the user bails out
-manually at some point during execution.
-.Pp
-Exit status is 1 if it fails for one of the following reasons:
-.Pp
-Invalid command line option
-.Pp
-Failure to create the temporary root environment
-.Pp
-Failure to populate the temporary root
.Sh HISTORY
The
.Nm
OpenPOWER on IntegriCloud