src-test2/gnu/usr.bin/diff/diff3.c, branch release/2.2.8_cvs

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28T19:11:01Z

In future, it should be as easy as "update -j ....", but this time I had to go over it by hand. Not nice..

Remove trailing whitespace.

1995-05-30T05:05:38Z

Fixed non-conflict errors that occur when changes made to the local files are

1995-02-20T18:47:18Z

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 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

Updated to GNU diffutils 2.6

1993-11-12T07:05:54Z

Update diff, diff3, and sdiff's makefiles to use .PATH: instead of

1993-07-09T20:36:06Z

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.