Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx> writes: > 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. I am somewhat skeptical about that statement. These files are designed to be one-entry-per-line so that useful information in the non-conflicted parts in a conflicted file (which should be majority) can still be used. Only the .gitmodules is an oddball. -- 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