kmx git

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

Commit	Date	Message
2a3e0635	2017-12-04T16:56:07	Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
0ef19fe1	2014-01-20T17:13:55	Merge submodules
17820381	2013-11-14T14:05:52	Rename tests-clar to tests