thodg/libgit2/tests/merge

---

tests/merge

---

Log

Author	Commit	Date	CI	Message
	eac938d9	2013-12-02T14:10:04		Bare naked merge and rebase
	17820381	2013-11-14T14:05:52		Rename tests-clar to tests