Ignore submodules when checking for merge conflicts in the workdir.
Ignore submodules when checking for merge conflicts in the workdir.
Corillian/libgit2,stewid/libgit2,stewid/libgit2,Corillian/libgit2,Corillian/libgit2,stewid/libgit2,stewid/libgit2,stewid/libgit2,Corillian/libgit2,Corillian/libgit2,stewid/libgit2,Corillian/libgit2