From: Gerrit Pape <pape@smarden.org>
Date: Wed, 08 Aug 2007 14:39:43 GMT
Subject: Re: [PATCH 1/2] merge-recursive: sometimes, d/f conflict is not an issue
Message-ID: <20070808143943.12061.qmail@de98ec6b1268cc.315fe32.mid.smarden.org>
In-Reply-To: <Pine.LNX.4.64.0707171812490.14781@racer.site>

On Tue, Jul 17, 2007 at 06:13:12PM +0100, Johannes Schindelin wrote:
> When a merge has a d/f conflict on a path which was not touched
> between the merge base(s) and the remote HEAD, and the index and
> HEAD contain the same version for that path (even if empty), it
> is not really a conflict.

Hi, this patch solves the reported problem fine, and it didn't break
anything for me yet.  Can this still be considered for 1.5.3?

Thanks, Gerrit.