Date: Mon, 28 May 2001 02:35:31 -0700 (PDT) From: Doug Barton <dougb@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200105280935.f4S9ZVd40531@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2001/05/28 02:35:30 PDT
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Fix a problem when user selects -a (auto run) but we encounter a file
missing on the system. Instead of passing it by, mm was prompting...
bad mm, no cookie!
Brought to my attention by the PR, but the fix needed to be tweaked to
handle the auto-install option as well.
PR: misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>
Revision Changes Path
1.20 +17 -2 src/usr.sbin/mergemaster/mergemaster.sh
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105280935.f4S9ZVd40531>