256281 |
10-Oct-2013 |
gjb |
Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
|
204227 |
22-Feb-2010 |
delphij |
POSIX patch(1) would treat -b as different meaning (the functionality is to be provided by --suffix). Looking at the usage here in diffutils, it seems that we can just get rid of the -b .orig stuff. This resolves a problem that can triggered if we move toward to a more permissively licensed patch(1) program.
|
170758 |
15-Jun-2007 |
delphij |
Update build skeleton after diffutils 2.8.7 update.
|
125910 |
17-Feb-2004 |
ache |
Remove getopt*.c, we already have compatible getopt_long() in libc
|
50472 |
27-Aug-1999 |
peter |
$Id$ -> $FreeBSD$
|
30843 |
29-Oct-1997 |
ache |
Switch to contrib version
|
13123 |
30-Dec-1995 |
peter |
This commit was generated by cvs2svn to compensate for changes in r13122, which included commits to RCS files with non-trunk default branches.
|
6575 |
20-Feb-1995 |
nate |
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
|
753 |
12-Nov-1993 |
nate |
Updated to GNU diffutils 2.6
|
726 |
08-Nov-1993 |
nate |
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.
|
116 |
09-Jul-1993 |
conklin |
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.
|
71 |
29-Jun-1993 |
nate |
This commit was generated by cvs2svn to compensate for changes in r70, which included commits to RCS files with non-trunk default branches.
|