[PATCH v2 0/2] better handle .gitmodules merge conflicts · Jens Lehmann <hidden> · 2016-06-15
[PATCH v2 1/2] test that git status works with merge conflict in, .gitmodules · Jens Lehmann <hidden> · 2016-06-15
[PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts · Jens Lehmann <hidden> · 2016-06-15
Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts · Nguyen Thai Ngoc Duy <hidden> · 2016-06-15
Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts · Jens Lehmann <hidden> · 2016-06-15

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

From: Nguyen Thai Ngoc Duy <hidden>
Date: 2016-06-15 22:51:14

On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann [off-list ref] 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