On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann <Jens.Lehmann@xxxxxx> wrote: > Commands like "git status", "git diff" and "git fetch" would fail when the > .gitmodules file contained merge conflicts because ... Side note. .gitattributes and .gitignore likely suffer the same. Perhaps the unmerged check in this patch can be generalized for reuse. -- Duy -- 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