From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 09 Apr 2007 18:58:09 GMT
Subject: Re: [PATCH 4/5] merge-recursive: handle D/F conflict case more carefully.
Message-ID: <20070409185809.GA13212@steel.home>
In-Reply-To: <7v6488ckk0.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano, Sat, Apr 07, 2007 16:42:55 +0200:
> +			if (unlink(path)) {
> +				if (errno == EISDIR) {
> +					/* something else exists */
> +					error(msg, path, ": perhaps a D/F conflict?");

isn't this one an F/D conflict?