From owner-cvs-bin Mon Feb 17 03:29:59 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09426 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:29:59 -0800 (PST) Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09418; Mon, 17 Feb 1997 03:29:56 -0800 (PST) Date: Mon, 17 Feb 1997 03:29:56 -0800 (PST) From: Bruce Evans Message-Id: <199702171129.DAA09418@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/df - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 97/02/17 03:29:56 src/bin/df - Imported sources Update of /home/ncvs/src/bin/df In directory freefall.freebsd.org:/c/bde/src/df Revision/Branch: 1.1.1 Log Message: Attempt to import Lite2's df. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 C src/bin/df/df.1 C src/bin/df/df.c C src/bin/df/Makefile 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/bin/df