Date: Sun, 1 Aug 2004 16:50:11 -0400 From: Garance A Drosihn <drosih@rpi.edu> To: Garance A Drosehn <gad@FreeBSD.org>, src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/patch - Imported sources Message-ID: <p06110433bd33078b3fa2@[128.113.24.47]> In-Reply-To: <200408012045.i71KjtFX087582@repoman.freebsd.org> References: <200408012045.i71KjtFX087582@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At 8:45 PM +0000 8/1/04, Garance A Drosehn wrote: > > Vendor Tag: OPENBSD > Release Tags: OpenBSD_20040801 > > N src/usr.bin/patch/backupfile.c > N src/usr.bin/patch/backupfile.h > C src/usr.bin/patch/common.h > C src/usr.bin/patch/inp.c > C src/usr.bin/patch/inp.h > C src/usr.bin/patch/Makefile > C src/usr.bin/patch/patch.1 > C src/usr.bin/patch/patch.c > N src/usr.bin/patch/pathnames.h > C src/usr.bin/patch/pch.c > C src/usr.bin/patch/pch.h > C src/usr.bin/patch/README > C src/usr.bin/patch/util.c > C src/usr.bin/patch/util.h > > 11 conflicts created by this import. Hrm. That wasn't what I was expecting to happen... Sigh. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p06110433bd33078b3fa2>