From owner-cvs-gnu  Mon Feb 20 10:57:43 1995
Return-Path: cvs-gnu-owner
Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA01643 for cvs-gnu-outgoing; Mon, 20 Feb 1995 10:57:43 -0800
Received: from rocky.sri.MT.net (sri.MT.net [204.94.231.129]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id KAA01630; Mon, 20 Feb 1995 10:57:37 -0800
Received: (from nate@localhost) by rocky.sri.MT.net (8.6.9/8.6.9) id LAA15023; Mon, 20 Feb 1995 11:58:57 -0700
Message-Id: <199502201858.LAA15023@rocky.sri.MT.net>
From: Nate Williams <nate@sneezy.sri.com>
Date: Mon, 20 Feb 1995 11:58:57 -0700
In-Reply-To: "Nate Williams" <nate@freefall.cdrom.com>
       "cvs commit: src/gnu/usr.bin/diff3 diff3.1" (Feb 20, 10:47)
Reply-To: Nate Williams <nate@sneezy.sri.com>
X-Mailer: Mail User's Shell (7.2.5 10/14/92)
To: CVS-commiters@freefall.cdrom.com, cvs-gnu@freefall.cdrom.com
Subject: Re: 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.

Note:
  I verified that this does indeed work in our setup exactly by doing a
quick sup update of the gnu tree and then making sure that these changes
I had committed to diff on my machine didn't show up as conflicts.
  It had worked perfectly in all my contrived tests, but a real world
example is always much better. :-)