thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e

---

tests-clar/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e

---

Log

Author	Commit	Date	CI	Message
	3acf44d6	2013-07-17T09:43:32		tests for checkout index with conflicts