kmx git

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

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
	17820381	2013-11-14T14:05:52		Rename tests-clar to tests