Subject: Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts

From: Jens Lehmann <[email-masked]>
Date: Sat, 14 May 2011 19:46:27 +0200

Am 14.05.2011 18:59, schrieb Nguyen Thai Ngoc Duy:
> On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann <[email-masked]> 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.

Interesting thought. But adding conflict markers in those files
doesn't break anything the way it did for .gitmodules, so this
looks like a non-issue.