freebsd-nq/gnu/usr.bin
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
..
as Add doc to SUBDIR list 1995-01-16 17:40:57 +00:00
awk Add doc to SUBDIR 1995-01-16 17:49:20 +00:00
bc New manual page system 1993-07-02 04:54:10 +00:00
binutils/gdb Here's a patch to gdb-4.13 to add dyadic frames, as per J"org Wunsch. 1995-01-17 13:52:39 +00:00
cc Add doc subdir 1995-01-22 21:56:38 +00:00
cpio Use __GNU_P not __P. 1994-08-04 20:57:07 +00:00
cvs added *.info and *.db to the default "ignore" list in cvs to avoid obviously 1995-02-04 20:27:23 +00:00
dc Add doc to SUBDIR 1995-01-16 17:49:20 +00:00
dialog Changes for new _menu interface 1995-02-15 19:48:10 +00:00
diff Fixed non-conflict errors that occur when changes made to the local files are 1995-02-20 18:47:18 +00:00
diff3 Fixed non-conflict errors that occur when changes made to the local files are 1995-02-20 18:47:18 +00:00
gdb Fix reading of stack addresses from core files. USRSTACK now really is 1995-01-31 18:07:36 +00:00
grep Use -lgnuregex 1995-01-11 05:07:00 +00:00
groff Quiet `make -s'. 1995-02-08 20:12:08 +00:00
gzip Make gzip static by default. This is needed because it's such a 1994-06-15 19:16:58 +00:00
ld Support for more Sun compatible dlopen() and friends. Also added proper error 1995-02-07 13:33:42 +00:00
man Wolfram now also submitted a man page for this. 1995-02-15 22:52:52 +00:00
mkisofs Add -D__BSD__ and don't write "LINUX" on a CD as default. 1995-02-13 06:54:47 +00:00
patch Fix bug that created new files even when running in -C check mode. 1995-01-12 22:09:40 +00:00
perl Export ${DESTDIR} to h2ph so that the *.ph files end up in the DESTDIR 1995-02-14 21:47:04 +00:00
pr Updated to GNU textutils-1.9 1993-11-08 17:07:38 +00:00
ptx Add doc to SUBDIR 1995-01-16 17:49:20 +00:00
rcs Delete two redundant declarations of _exit() and exit(). 1994-08-09 15:15:04 +00:00
sdiff Update to GNU diffutils 2.6 1993-11-12 07:05:40 +00:00
send-pr Add doc to SUBDIR 1995-01-16 17:49:20 +00:00
sort Changed a SORT 1L to a SORT 1. 1994-12-11 21:41:28 +00:00
tar Fixed up the text a bit, attribute NetBSD properly. 1995-01-31 04:36:48 +00:00
texinfo Whoops! It wasn't totally winning. I left out a couple of :'s. Fixed. 1995-02-19 09:52:52 +00:00
yppush Wrote manual page for yppush and edited Makefile to install it. 1995-02-05 21:48:04 +00:00
Makefile Add mkisofs to list of targets. 1995-02-12 09:51:53 +00:00
Makefile.inc New files for relocated source code. 1994-01-30 00:31:51 +00:00