From owner-cvs-all Mon Jun 5 20:21:59 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 028A837B98B; Mon, 5 Jun 2000 20:21:57 -0700 (PDT) (envelope-from obrien@FreeBSD.org) Received: (from obrien@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id UAA41628; Mon, 5 Jun 2000 20:21:56 -0700 (PDT) (envelope-from obrien@FreeBSD.org) Message-Id: <200006060321.UAA41628@freefall.freebsd.org> From: "David E. O'Brien" Date: Mon, 5 Jun 2000 20:21:56 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/gcc/config/alpha elf.h Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG obrien 2000/06/05 20:21:56 PDT Modified files: contrib/gcc/config/alpha elf.h Log: Fix conflicts where CVS is *so* fscking idiotic that it can't understand that in the last two revisions the only thing changed from the head of the vendor branch is the addition of $FreeBSD$. I really have to wonder if CVS could be made more stupid. No, I don't think CVS could be made any dumber even if all the FreeBSD committers worked together in an attempt to do so. So once again, lets take the head of the vendor branch add "/* $FreeBSD$ */" to it and commit it. Revision Changes Path 1.4 +89 -67 src/contrib/gcc/config/alpha/elf.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message