thodg/libgit2/tests-clar/resources/merge-resolve/conflicting.txt

---

tests-clar/resources/merge-resolve/conflicting.txt

---

Log

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