From fbf4979ac2229072800b2736d6f9480ab1b8858c Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 29 Apr 2008 09:08:33 +0000
Subject: [PATCH] Mention -U and -ai arguments to mergemaster in a comment for
 the general mergemaster line.

MFC after:	3 days
Suggested by:	Ben Laurie
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5265f4f06ce..a020a8552ac 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@
 #  6.  `mergemaster -p'
 #  7.  `make installworld'
 #  8.  `make delete-old'
-#  9.  `mergemaster'
+#  9.  `mergemaster'                         (you may wish to use -U or -ai).
 # 10.  `reboot'
 # 11.  `make delete-old-libs' (in case no 3rd party program uses them anymore)
 #