From owner-cvs-user  Fri Dec 13 11:36:31 1996
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id LAA08367
          for cvs-user-outgoing; Fri, 13 Dec 1996 11:36:31 -0800 (PST)
Received: (from asami@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id LAA08360;
          Fri, 13 Dec 1996 11:36:29 -0800 (PST)
Date: Fri, 13 Dec 1996 11:36:29 -0800 (PST)
From: Satoshi Asami <asami>
Message-Id: <199612131936.LAA08360@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/contrib/cvs/src diff.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

asami       96/12/13 11:36:29

  Branch:      contrib/cvs/src  RELENG_2_2
  Modified:    contrib/cvs/src  diff.c
  Log:
  Merge from 1.2.
  
  Reviewed by:	peter
  Pre-approved by:	jkh
  
  Revision  Changes    Path
  1.1.1.1.2.1 +2 -2      src/contrib/cvs/src/diff.c