thodg/libgit2/tests/resources/merge-resolve/.gitted/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78

---

tests/resources/merge-resolve/.gitted/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78

---

Log

Author	Commit	Date	CI	Message
	2a3e0635	2017-12-04T16:56:07		Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict