From owner-cvs-src-old@FreeBSD.ORG Fri Jan 2 00:02:28 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E02DE1065740 for ; Fri, 2 Jan 2009 00:02:28 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B31808FC14 for ; Fri, 2 Jan 2009 00:02:28 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0202SiZ013214 for ; Fri, 2 Jan 2009 00:02:28 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0202SoS013213 for cvs-src-old@freebsd.org; Fri, 2 Jan 2009 00:02:28 GMT (envelope-from dougb@repoman.freebsd.org) Message-Id: <200901020002.n0202SoS013213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to dougb@repoman.freebsd.org using -f From: Doug Barton Date: Fri, 2 Jan 2009 00:02:14 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2009 00:02:29 -0000 dougb 2009-01-02 00:02:14 UTC FreeBSD src repository Modified files: usr.sbin/mergemaster mergemaster.sh Log: SVN rev 186688 on 2009-01-02 00:02:14Z by dougb For IGNORE_FILES delete the version in the TEMPROOT, not the base. Submitted by: clemens fischer Revision Changes Path 1.62 +1 -1 src/usr.sbin/mergemaster/mergemaster.sh