thodg/libgit2/tests/resources/merge-recursive/oyster.txt

---

tests/resources/merge-recursive/oyster.txt

---

Log

Author	Commit	Date	CI	Message
	34a51428	2015-11-09T11:55:26		merge tests: add complex recursive example
	86c8d02c	2015-10-22T20:20:07		merge: add simple recursive test Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.