From owner-cvs-gnu  Mon Feb 20 10:47:38 1995
Return-Path: cvs-gnu-owner
Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA01009 for cvs-gnu-outgoing; Mon, 20 Feb 1995 10:47:38 -0800
Received: (from nate@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA00993; Mon, 20 Feb 1995 10:47:20 -0800
Date: Mon, 20 Feb 1995 10:47:20 -0800
From: Nate Williams <nate>
Message-Id: <199502201847.KAA00993@freefall.cdrom.com>
To: CVS-commiters, cvs-gnu
Subject: cvs commit: src/gnu/usr.bin/diff3 diff3.1
Sender: cvs-gnu-owner@freebsd.org
Precedence: bulk

nate        95/02/20 10:47:19

  Modified:    gnu/usr.bin/diff diff3.c
               gnu/usr.bin/diff3 diff3.1
  Log:
  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