From bc1b4f78f916e99f33258c7c6bd42a3b0f64d7ff Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Fri, 15 Jan 2010 04:09:22 +0000 Subject: [PATCH] Oops, deleted one line too many. Add back the null case for IGNORE_MOTD --- usr.sbin/mergemaster/mergemaster.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index a723214710af..1bb591578acc 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -652,6 +652,7 @@ case "${RERUN}" in esac case "${IGNORE_MOTD}" in + '') ;; *) echo '' echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file."