From owner-cvs-all Wed Feb 5 3: 9:24 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6285D37B401; Wed, 5 Feb 2003 03:09:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01DCE43F75; Wed, 5 Feb 2003 03:09:22 -0800 (PST) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h15B9Lbv089200; Wed, 5 Feb 2003 03:09:21 -0800 (PST) (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h15B9LWA089199; Wed, 5 Feb 2003 03:09:21 -0800 (PST) Message-Id: <200302051109.h15B9LWA089199@repoman.freebsd.org> From: Doug Barton Date: Wed, 5 Feb 2003 03:09:21 -0800 (PST) To: all-committers@FreeBSD.org, legacy-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG dougb 2003/02/05 03:09:21 PST Modified files: usr.sbin/mergemaster mergemaster.sh Log: * Update copyright year. * Give back one line of ws when showing a diff. This was requested by several. * Un-quote DIFF_FLAG, and add DIFF_OPTIONS. This will allow the user to do more creative things in a mergemaster rc file. Un-quoting is necessary in order to handle things like CVS Id tags that look like shell variables. * Simplify terminal width determination. Suggestions related to ignoring the CVS Id's were taken from several, with dillon and gad providing particularly helpful feedback. Revision Changes Path 1.41 +6 -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