kmx git

tests/resources/merge-resolve/.gitted/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4

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