Commit Graph

8 Commits

Author SHA1 Message Date
Rodney W. Grimes
4399be3cbd Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
Nate Williams
f8972f58e8 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
Andrey A. Chernov
49b95be03e Use -lgnuregex 1995-01-11 05:45:48 +00:00
Nate Williams
45a409ee7b Update to GNU diffutils 2.6
(Forgot to cvs add them)
1993-11-12 07:06:35 +00:00
Nate Williams
c7ed70b75d Updated to GNU diffutils 2.6 1993-11-12 07:05:54 +00:00
Nate Williams
c4b4b635be 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
J.T. Conklin
4d5de78c85 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 Williams
515337cf85 GNU Diff 2.3 1993-06-29 08:13:44 +00:00