thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2

---

tests-clar/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2

---

Log

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