summaryrefslogtreecommitdiff
path: root/src/xdiff/xmerge.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix warnings on 64-bit windows buildsRussell Belfer2012-04-171-3/+3
| | | | | This fixes all the warnings on win64 except those in deps, which come from the regex code.
* Import xdiff library from gitRussell Belfer2012-03-021-0/+619
This is the initial import of the xdiff code (LGPL) from core git as of rev f349b562086e2b7595d8a977d2734ab2ef9e71ef