d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
223,602 Commits 4 Branches 49 Tags 2 GiB
fdd82373a2
Commit Graph

68 Commits

Author SHA1 Message Date
peter
c3f352d4ad This commit was generated by cvs2svn to compensate for changes in r13122, 
which included commits to RCS files with non-trunk default branches.
 1995-12-30 19:02:48 +00:00
peter
ab124e78b0 recording cvs-1.6 file death 1995-12-30 19:02:48 +00:00
ache
ace51e8ffc Add setlocale LC_CTYPE 1995-10-31 08:44:21 +00:00
peter
3ad56373bb Build and install diff.info.. 
As Bruce said, this is a little bogus, it'd be nice if bsd.prog.mk knew
about .texi in the same way as it does man pages..

Submitted by: bde
 1995-10-29 09:08:35 +00:00
peter
827c6af86c This commit was generated by cvs2svn to compensate for changes in r11905, 
which included commits to RCS files with non-trunk default branches.
 1995-10-29 08:52:27 +00:00
peter
7e662b2efd Import diff-2.7's diff.texi which I left out last time. 
Suggested by: bde
 1995-10-29 08:52:27 +00:00
peter
c37ff62e9b 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..
 1995-10-28 19:11:01 +00:00
peter
27378b5694 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)
 1995-10-28 18:51:33 +00:00
peter
72fa7ec057 This commit was generated by cvs2svn to compensate for changes in r11884, 
which included commits to RCS files with non-trunk default branches.
 1995-10-28 18:51:33 +00:00
rgrimes
2ad6f3dee6 Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
nate
0171ba082e Fixed non-conflict errors that occur when changes made to the local files are 
the same as the changes made in the repository.  This is often seen by
people with remote CVS trees that have applied their local patches to the
master site.  a 'cvs update' will show bogus conflicts.

Obtained from: CVS mailing list, Stig<stig@inse.com>

In diffutils 2.6 and 2.7, diff3 -A complains about identical overlapping
changes.  They're different from the ancestor but not from each other...
Why bother?  The patch below fixes this nonsense and preserves [B]ackwards
compatiblity with the -B flag (also --show-bogus-conflicts).

    Party on...
    Stig
 1995-02-20 18:47:18 +00:00
ache
48a3ca7f45 Use -lgnuregex 1995-01-11 05:45:48 +00:00
cvs2svn
0b7c012349 This commit was manufactured by cvs2svn to create branch 'GNU'. 1993-11-12 07:06:36 +00:00
nate
3bcb26e56e Update to GNU diffutils 2.6 
(Forgot to cvs add them)
 1993-11-12 07:06:35 +00:00
nate
0ed7263429 Updated to GNU diffutils 2.6 1993-11-12 07:05:54 +00:00
nate
d0fbf26539 From: Larry Jones <scjones@thor.sdrc.com> 
Subject: man pages for diff et al.

I finally got tired of not having man pages for diff and friends, so I
edited the appropriate sections of the texinfo manual into man format.
 1993-11-08 01:36:04 +00:00
conklin
2a4d079c1f Update diff, diff3, and sdiff's makefiles to use .PATH: instead of 
copying the same files to multiple directories.  This should make
things easier when it comes time to update to a newer version of
diffutils.

With this checkin, this brings the netbsd and freebsd diff dists
into sync.
 1993-07-09 20:36:06 +00:00
nate
aee35757e3 GNU Diff 2.3 1993-06-29 08:13:44 +00:00