thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/35/0c6eb3010efc403a6bed682332635314e9ed58

---

tests-clar/resources/merge-resolve/.gitted/objects/35/0c6eb3010efc403a6bed682332635314e9ed58

---

Log

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