thodg/libgit2

2017-12-04T16:56:07

Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict