| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
which included commits to RCS files with non-trunk default branches.
|
| |
|
| |
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| | |
which included commits to RCS files with non-trunk default branches.
|
| |
| |
| |
| | |
Suggested by: bde
|
| |
| |
| |
| |
| | |
In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand. Not nice..
|
|\ \
| |/
| |
| | |
which included commits to RCS files with non-trunk default branches.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
(Forgot to cvs add them)
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
|/
|
|
|
|
|
|
|
| |
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.
|
|
|