Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Oct 1995 11:51:34 -0700
From:      Peter Wemm <peter>
To:        CVS-commiters, cvs-gnu
Subject:   cvs commit: src/gnu/usr.bin/diff - Imported sources
Message-ID:  <199510281851.LAA08587@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
peter       95/10/28 11:51:34

  Branch:      gnu/usr.bin/diff  1.1.1
  Log:
  Import GNU diffutils 2.7
  
  Note, this is going to be messy.. 2.3 was vendor-branch imported, while
  2.6 was done as a delta. Sigh.  I'm importing this on a vendor branch so
  that it will be easier to deal with next time..
  
  (cvs-1.6 wants rcs-5.7, and rcs-5.7 suggests diffutils-2.7)
  
  Status:
  
  Vendor Tag:	GNU
  Release Tags:	diff_2_7
  
  C src/gnu/usr.bin/diff/diff.c
  C src/gnu/usr.bin/diff/analyze.c
  C src/gnu/usr.bin/diff/cmpbuf.c
  C src/gnu/usr.bin/diff/cmpbuf.h
  C src/gnu/usr.bin/diff/io.c
  C src/gnu/usr.bin/diff/context.c
  C src/gnu/usr.bin/diff/ed.c
  C src/gnu/usr.bin/diff/normal.c
  C src/gnu/usr.bin/diff/ifdef.c
  C src/gnu/usr.bin/diff/util.c
  C src/gnu/usr.bin/diff/dir.c
  C src/gnu/usr.bin/diff/version.c
  C src/gnu/usr.bin/diff/diff.h
  C src/gnu/usr.bin/diff/side.c
  C src/gnu/usr.bin/diff/system.h
  C src/gnu/usr.bin/diff/diff3.c
  C src/gnu/usr.bin/diff/sdiff.c
  N src/gnu/usr.bin/diff/xmalloc.c
  C src/gnu/usr.bin/diff/getopt.c
  C src/gnu/usr.bin/diff/getopt1.c
  U src/gnu/usr.bin/diff/getopt.h
  N src/gnu/usr.bin/diff/fnmatch.c
  C src/gnu/usr.bin/diff/fnmatch.h
  N src/gnu/usr.bin/diff/NEWS
  C src/gnu/usr.bin/diff/COPYING
  C src/gnu/usr.bin/diff/config.h
  
  22 conflicts created by this import.
  Use the following command to help the merge:
  
  	ccvs checkout -jGNU:yesterday -jGNU src/gnu/usr.bin/diff



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199510281851.LAA08587>