From owner-freebsd-commit  Sat Oct 28 12:11:12 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA10436
          for freebsd-commit-outgoing; Sat, 28 Oct 1995 12:11:12 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA10420
          for cvs-all-outgoing; Sat, 28 Oct 1995 12:11:09 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA10408
          for cvs-gnu-outgoing; Sat, 28 Oct 1995 12:11:07 -0700
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA10392
          ; Sat, 28 Oct 1995 12:11:03 -0700
Date: Sat, 28 Oct 1995 12:11:03 -0700
From: Peter Wemm <peter>
Message-Id: <199510281911.MAA10392@freefall.freebsd.org>
To: CVS-commiters, cvs-gnu
Subject: cvs commit: src/gnu/usr.bin/diff config.h context.c diff.c diff.h diff3.c dir.c getopt.c getopt1.c ifdef.c io.c sdiff.c side.c system.h util.c version.c fnmatch.c
Sender: owner-commit@FreeBSD.org
Precedence: bulk

peter       95/10/28 12:11:02

  Modified:    gnu/usr.bin/diff  config.h context.c diff.c diff.h diff3.c
                        dir.c getopt.c  getopt1.c ifdef.c io.c sdiff.c
                        side.c system.h util.c  version.c
  Removed:     gnu/usr.bin/diff  fnmatch.c
  Log:
  Merge in/out comflicts caused by Diffutils-2.7 import...
  
  In future, it should be as easy as "update -j ....", but this time I had to
  go over it by hand.  Not nice..