summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2009-01-02 22:24:12 +0000
committerdougb <dougb@FreeBSD.org>2009-01-02 22:24:12 +0000
commit7c321f872c85f1c9ac4f673ef0361e555eb5e579 (patch)
treeab6c12734a67f8762341e97274436007eb5d1611 /usr.sbin/mergemaster
parent636826531a5b073e0d2a69852b90b3230ccbff11 (diff)
downloadFreeBSD-src-7c321f872c85f1c9ac4f673ef0361e555eb5e579.zip
FreeBSD-src-7c321f872c85f1c9ac4f673ef0361e555eb5e579.tar.gz
Add a note to the -m option indicating that you should now specify src/
instead of src/etc.
Diffstat (limited to 'usr.sbin/mergemaster')
-rw-r--r--usr.sbin/mergemaster/mergemaster.810
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 10c5ae7..aaf7e54 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 1, 2009
+.Dd January 2, 2009
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -218,6 +218,14 @@ Specify the path to the directory where you want to do the
.Xr make 1 .
(In other words, where your sources are, but -s was already
taken.)
+In previous versions of
+.Nm
+you needed to specify the path all the way to
+.Pa src/etc .
+Starting with r186678 you only need to specify the path to
+.Pa src .
+.Nm
+will convert the path for you if you use the old method.
.It Fl t Ar /path/to/temp/root
Create the temporary root environment in
.Pa /path/to/temp/root
OpenPOWER on IntegriCloud