From owner-cvs-all Sat Mar 1 18:46:55 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 9032337B401; Sat, 1 Mar 2003 18:46:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3206A43FB1; Sat, 1 Mar 2003 18:46:54 -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 h222ks0U080389; Sat, 1 Mar 2003 18:46:54 -0800 (PST) (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h222krJJ080388; Sat, 1 Mar 2003 18:46:53 -0800 (PST) Message-Id: <200303020246.h222krJJ080388@repoman.freebsd.org> From: Doug Barton Date: Sat, 1 Mar 2003 18:46:53 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-FreeBSD-CVS-Branch: RELENG_4 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/03/01 18:46:53 PST FreeBSD src repository Modified files: (Branch: RELENG_4) usr.sbin/mergemaster mergemaster.sh Log: MFC 1.41, including the new DIFF_OPTIONS variable, and misc. small improvements Approved by: re (murray) Revision Changes Path 1.6.2.16 +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