thodg/libgit2/tests/resources/merge-recursive/.gitted/objects/21

---

tests/resources/merge-recursive/.gitted/objects/21

---

Log

Author	Commit	Date	CI	Message
	b1eef912	2015-10-27T18:00:30		merge: add recursive test with conflicting contents