Jeff King <peff@xxxxxxxx> writes: > Actually, I think the problem is not in mergetool at all, but with the > dir.c code underlying "git add". "git add" really should not be > complaining, because you are not adding a new path at all, but are > rather adding content to a tracked path. Correct, and thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html