thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559

---

tests-clar/resources/merge-resolve/.gitted/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559

---

Log

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