Date: Sat, 1 Apr 2000 18:47:21 -0800 (PST) From: Alfred Perlstein <alfred@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200004020247.SAA93611@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
alfred 2000/04/01 18:47:21 PST
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Make mergemaster only take single letters for options as well as loop
asking a question again if given an invalid input instead of assuming
what the user wants. /etc is not the place to make assumptions when
given invalid input.
Reformat some of the more convoluted code into seperate functions instead
of being inline using tabs instead of space indents.
Allow the user to view merged files they created with sdiff.
Allow the user to redisplay the diff between the installed file and
the new file again.
Time wasted waiting for review: 1 month 2 weeks
Revision Changes Path
1.7 +168 -115 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?200004020247.SAA93611>