Hi,

On Wed, 29 Nov 2006, Randal L. Schwartz wrote:

quoted text
> I build daily, and apaprently I built git-merge-recursive-old,
> but it's not in .gitignore.  Needs to be added, no?

To the contrary. You need to remove it: v1.4.4-g7cdbff1 removed it, but 
you still have the generated file...

Hth,
Dscho

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html