kmx git

src/xdiff/xprepare.h

Author	Commit	Date	CI	Message
	7f52bc5a	2018-01-20T18:19:26		xdiff: upgrade to git's included xdiff Upgrade xdiff to git's most recent version, which includes changes to CR/LF handling. Now CR/LF included in the input files will be detected and conflict markers will be emitted with CR/LF when appropriate.
	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