Date: Sat, 4 May 2002 15:45:12 -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: <200205042245.g44MjCK04933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2002/05/04 15:45:12 PDT
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
* Add some niceties to make the -p option quieter, and better behaved
* Take a simple idea about setting the screen width using stty (for sdiff's
purposes) thoughtfully suggested by Joerg to an absurd conclusion.
Revision Changes Path
1.30 +28 -5 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?200205042245.g44MjCK04933>