From owner-source-changes@NetBSD.ORG Tue Mar 7 08:21:51 1995 Return-Path: owner-source-changes@NetBSD.ORG Received: from pain.lcs.mit.edu (pain.lcs.mit.edu [128.52.46.239]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id IAA17727; Tue, 7 Mar 1995 08:21:51 -0800 Received: (from daemon@localhost) by pain.lcs.mit.edu (8.6.9/8.6.9) id JAA09716 for source-changes-outgoing; Tue, 7 Mar 1995 09:50:19 -0500 Received: (from source@localhost) by pain.lcs.mit.edu (8.6.9/8.6.9) id JAA09683 for source-changes; Tue, 7 Mar 1995 09:50:05 -0500 Date: Tue, 7 Mar 1995 09:50:05 -0500 From: The Source of All Evil Message-Id: <199503071450.JAA09683@pain.lcs.mit.edu> To: source-changes@pain.lcs.mit.edu Subject: sun-lamp CVS commits Sender: owner-source-changes@NetBSD.ORG Precedence: list X-Loop: source-changes@NetBSD.ORG cgd Tue Mar 7 09:45:53 EST 1995 Update of /a/cvsroot/src/usr.sbin/mtree In directory pain.lcs.mit.edu:/b/tmp/cvs-serv9560 Revision/Branch: 1.1.1 Log Message: from 4.4-Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/usr.sbin/mtree/compare.c C src/usr.sbin/mtree/create.c C src/usr.sbin/mtree/extern.h C src/usr.sbin/mtree/Makefile C src/usr.sbin/mtree/misc.c C src/usr.sbin/mtree/mtree.8 C src/usr.sbin/mtree/mtree.c C src/usr.sbin/mtree/mtree.h C src/usr.sbin/mtree/spec.c C src/usr.sbin/mtree/verify.c 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/mtree