thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/7a/a3edf2bcfee22398e6b55295aa56366b7aaf76

---

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

---

Log

Author	Commit	Date	CI	Message
	bec65a5e	2013-04-01T22:16:21		merge!