thodg/libgit2/tests-clar/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656

---

tests-clar/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656

---

Log

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