aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff
Commit message (Collapse)AuthorAgeFilesLines
* MFC revision 1.10:Xin LI2005-12-311-1/+1
| | | | | | | | | | Suggest the user to use 'diff -urN' instead of 'diff -crN'. Submitted by: Jimmie James <jimmiejaz@gmail.com> PR: docs/88427 Notes: svn path=/stable/6/; revision=153928
* Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnuAndrey A. Chernov2004-02-171-1/+1
| | | | Notes: svn path=/head/; revision=125931
* Remove files no longer neededAndrey A. Chernov2004-02-161-2/+3
| | | | | | | Switch back to regex.h Notes: svn path=/head/; revision=125895
* Fixed style of DPADD and LDADD assignments as per style.Makefile(5).Ruslan Ermilov2004-02-051-2/+2
| | | | Notes: svn path=/head/; revision=125503
* Add a section documenting the return values from diff.Ceri Davies2004-02-011-0/+5
| | | | | | | | | PR: docs/59991 Submitted by: keramida,Erik Greenwald <erik@smluc.org> MFC After: 1 week Notes: svn path=/head/; revision=125306
* Document -p option of diff.Giorgos Keramidas2002-08-261-0/+3
| | | | | | | | PR: docs/41887 Submitted by: tobez Notes: svn path=/head/; revision=102425
* Add note about the info documentation of diff(1).Giorgos Keramidas2002-07-111-0/+4
| | | | | | | | | | It contains a detailed description of the =format option part. PR: docs/36464 Submitted by: Gary W. Swearingen <swear@blarg.net> Notes: svn path=/head/; revision=99815
* s/dir.h/dir.c/Poul-Henning Kamp1999-11-261-1/+1
| | | | Notes: svn path=/head/; revision=53715
* Style changes -- whitespace and sorting.David E. O'Brien1999-11-261-6/+6
| | | | Notes: svn path=/head/; revision=53704
* * Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofDavid E. O'Brien1999-11-262-1/+13
| | | | | | | | | | 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. Notes: svn path=/head/; revision=53703
* $Id$ -> $FreeBSD$Peter Wemm1999-08-272-2/+2
| | | | Notes: svn path=/head/; revision=50472
* Clarify that "-w" ignores horizontal white space changes.David E. O'Brien1999-08-011-1/+1
| | | | Notes: svn path=/head/; revision=49349
* Add an example for folks who can never remember how to generate aSheldon Hearn1999-07-291-0/+14
| | | | | | | | | | recursive diff for use with send-pr(1). PR: 12440 Requested by: David Kelly <dkelly@hiwaay.net> Notes: svn path=/head/; revision=49224
* Define PR_PROGRAM properlyAndrey A. Chernov1997-10-291-0/+1
| | | | Notes: svn path=/head/; revision=30846
* Switch to contrib versionAndrey A. Chernov1997-10-2927-14601/+11
| | | | Notes: svn path=/head/; revision=30842
* Add (unsigned char) cast to ctype macrosAndrey A. Chernov1997-10-231-5/+5
| | | | Notes: svn path=/head/; revision=30658
* Revert $FreeBSD$ to $Id$Peter Wemm1997-02-222-2/+2
| | | | Notes: svn path=/head/; revision=22996
* Make the long-awaited change from $Id$ to $FreeBSD$Jordan K. Hubbard1997-01-142-2/+2
| | | | | | | | | | | 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. Notes: svn path=/head/; revision=21673
* Make this (hopefully) build now. There was no dir entry.Peter Wemm1997-01-121-2/+4
| | | | Notes: svn path=/head/; revision=21591
* Pick collate info fo rangesAndrey A. Chernov1996-08-201-2/+2
| | | | Notes: svn path=/head/; revision=17709
* There's no -p flag to our diff.Jordan K. Hubbard1996-05-261-3/+0
| | | | Notes: svn path=/head/; revision=15916
* Fix some argument ordering and redundancy bogons.Jordan K. Hubbard1996-05-261-6/+6
| | | | Notes: svn path=/head/; revision=15914
* Correct the path used to invoke "pr" if the "-l" option to diff isMike Pritchard1996-01-101-3/+3
| | | | | | | | | | specified. Also invoke "pr" with "-F" instead of the invalid "-f" option. Obtained from: NetBSD-bugs mailing list (PR# 1896) Notes: svn path=/head/; revision=13371
* This commit was generated by cvs2svn to compensate for changes in r13122,Peter Wemm1995-12-301-69/+0
| | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=13123
* recording cvs-1.6 file deathPeter Wemm1995-12-302-5661/+0
| | | | Notes: svn path=/cvs2svn/branches/ATT/; revision=13122
* Add setlocale LC_CTYPEAndrey A. Chernov1995-10-311-0/+6
| | | | Notes: svn path=/head/; revision=11951
* Build and install diff.info..Peter Wemm1995-10-292-1/+10
| | | | | | | | | | 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 Notes: svn path=/head/; revision=11909
* This commit was generated by cvs2svn to compensate for changes in r11905,Peter Wemm1995-10-291-0/+3916
|\ | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=11906
| * Import diff-2.7's diff.texi which I left out last time.Peter Wemm1995-10-291-0/+3916
| | | | | | | | | | | | | | Suggested by: bde Notes: svn path=/vendor/misc-GNU/dist2/; revision=11905
* | Merge in/out comflicts caused by Diffutils-2.7 import...Peter Wemm1995-10-2816-931/+978
| | | | | | | | | | | | | | | | In future, it should be as easy as "update -j ....", but this time I had to go over it by hand. Not nice.. Notes: svn path=/head/; revision=11886
* | This commit was generated by cvs2svn to compensate for changes in r11884,Peter Wemm1995-10-284-13/+436
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=11885
| * Import GNU diffutils 2.7Peter Wemm1995-10-2825-0/+10825
| | | | | | | | | | | 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) Notes: svn path=/vendor/misc-GNU/dist2/; revision=11884
* Remove trailing whitespace.Rodney W. Grimes1995-05-306-11/+11
| | | | Notes: svn path=/head/; revision=8858
* Fixed non-conflict errors that occur when changes made to the local files areNate Williams1995-02-201-8/+15
| | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=6575
* Use -lgnuregexAndrey A. Chernov1995-01-112-3/+5
| | | | Notes: svn path=/head/; revision=5500
* Update to GNU diffutils 2.6Nate Williams1993-11-123-0/+172
| | | | | | | (Forgot to cvs add them) Notes: svn path=/head/; revision=754
* Updated to GNU diffutils 2.6Nate Williams1993-11-1220-1606/+2495
| | | | Notes: svn path=/head/; revision=753
* From: Larry Jones <scjones@thor.sdrc.com>Nate Williams1993-11-082-1/+474
| | | | | | | | | | 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. Notes: svn path=/head/; revision=726
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofJ.T. Conklin1993-07-093-0/+3099
| | | | | | | | | | | | 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. Notes: svn path=/head/; revision=116
* GNU Diff 2.3Nate Williams1993-06-2920-0/+11777
Notes: svn path=/vendor/misc-GNU/dist2/; revision=67
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-14 05:59:06 +0000