Re: [PATCH 4/5] merge-recursive: handle D/F conflict case more carefully.

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?