Commit Graph

33 Commits

Author SHA1 Message Date
Poul-Henning Kamp
6512591f8d s/dir.h/dir.c/ 1999-11-26 12:29:48 +00:00
David E. O'Brien
c0bc11462b Style changes -- whitespace and sorting. 1999-11-26 03:06:33 +00:00
David E. O'Brien
20ee132cae * Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff.  These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.
1999-11-26 02:51:44 +00:00
Peter Wemm
9b7a44a60e $Id$ -> $FreeBSD$ 1999-08-27 23:37:10 +00:00
David E. O'Brien
6e7b8c218d Clarify that "-w" ignores horizontal white space changes. 1999-08-01 16:07:09 +00:00
Sheldon Hearn
ae996dee37 Add an example for folks who can never remember how to generate a
recursive diff for use with send-pr(1).

PR:	12440
Requested by:	David Kelly <dkelly@hiwaay.net>
1999-07-29 18:57:39 +00:00
Andrey A. Chernov
5a77e9d43b Define PR_PROGRAM properly 1997-10-29 17:35:54 +00:00
Andrey A. Chernov
cd56389a5d Switch to contrib version 1997-10-29 16:36:57 +00:00
Andrey A. Chernov
93bb056022 Add (unsigned char) cast to ctype macros 1997-10-23 02:22:51 +00:00
Peter Wemm
fce15c9ab3 Revert $FreeBSD$ to $Id$ 1997-02-22 15:48:31 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Peter Wemm
076bf094bc Make this (hopefully) build now. There was no dir entry. 1997-01-12 07:18:05 +00:00
Andrey A. Chernov
587ad47a9b Pick collate info fo ranges 1996-08-20 14:22:57 +00:00
Jordan K. Hubbard
bdf70e6dd8 There's no -p flag to our diff. 1996-05-26 22:27:52 +00:00
Jordan K. Hubbard
cfbaf65d93 Fix some argument ordering and redundancy bogons. 1996-05-26 21:56:24 +00:00
Mike Pritchard
78f03ca729 Correct the path used to invoke "pr" if the "-l" option to diff is
specified.  Also invoke "pr" with "-F" instead of the invalid "-f"
option.

Obtained from:  NetBSD-bugs mailing list (PR# 1896)
1996-01-10 10:41:47 +00:00
Peter Wemm
6065a0be11 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 Wemm
a5b996a7ec recording cvs-1.6 file death 1995-12-30 19:02:48 +00:00
Andrey A. Chernov
46e838403c Add setlocale LC_CTYPE 1995-10-31 08:44:21 +00:00
Peter Wemm
39db722b77 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 Wemm
d0a68277c8 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 Wemm
d4722af88f 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 Wemm
efce212686 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 Wemm
ec9763539f 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 Wemm
ffb120cc30 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
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