thodg/libgit2/src/xdiff/xmerge.c

---

src/xdiff/xmerge.c

---

Log

Author	Commit	Date	CI	Message
	3a5ad90a	2012-01-24T12:23:20		Import xdiff library from git This is the initial import of the xdiff code (LGPL) from core git as of rev f349b562086e2b7595d8a977d2734ab2ef9e71ef