| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Notes:
svn path=/stable/2.1/; revision=9211
|
| |
|
|
| |
Notes:
svn path=/head/; revision=8858
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
| |
Notes:
svn path=/head/; revision=5500
|
| |
|
|
|
|
|
| |
(Forgot to cvs add them)
Notes:
svn path=/head/; revision=754
|
| |
|
|
| |
Notes:
svn path=/head/; revision=753
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
Notes:
svn path=/vendor/misc-GNU/dist2/; revision=67
|
