diff options
| author | dougb <dougb@FreeBSD.org> | 2010-01-15 04:09:22 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-01-15 04:09:22 +0000 |
| commit | c5fa288ed5a9c86497430e9ccb67115b5066e6a8 (patch) | |
| tree | 9a5e12221ff38ef6cae9d4c86629506bf8332e9d /usr.sbin/mergemaster | |
| parent | 5f27710b2ba2273f51281e5a9c75437d8739a5ed (diff) | |
| download | FreeBSD-src-c5fa288ed5a9c86497430e9ccb67115b5066e6a8.zip FreeBSD-src-c5fa288ed5a9c86497430e9ccb67115b5066e6a8.tar.gz | |
Oops, deleted one line too many. Add back the null case for IGNORE_MOTD
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index a723214..1bb5915 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." |
