From: Nguyen Thai Ngoc Duy Date: Sat, 14 May 2011 16:59:04 GMT Subject: Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts Message-ID: In-Reply-To: <4DCEAD52.60707@web.de> On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann 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