thodg/libgit2/tests/resources/merge-resolve/added-in-master.txt

---

tests/resources/merge-resolve/added-in-master.txt

---

Log

Author	Commit	Date	CI	Message
	17820381	2013-11-14T14:05:52		Rename tests-clar to tests