From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Jun 2009 02:04:01 GMT
Subject: Re: BUG: mergetool fails on gitignore:d files
Message-ID: <7vk53wogku.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090530215418.GA19241@coredump.intra.peff.net>

Jeff King <peff@peff.net> 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.