summaryrefslogtreecommitdiff
path: root/src/xdiff/xmerge.c
Commit message (Expand)AuthorAgeFilesLines
* xdiff: catch memory allocation errorsPatrick Steinhardt2019-08-231-0/+12
* git_error: use new names in internal APIs and usageEdward Thomson2019-01-221-15/+15
* xdiff: upgrade to git's included xdiffEdward Thomson2018-01-211-20/+80
* xdiff: fix memleak on error casePatrick Steinhardt2016-03-011-2/+5
* xmerge: fix memory leak on error pathPatrick Steinhardt2016-02-231-0/+2
* xdiff: convert size variables to size_tEdward Thomson2015-10-051-44/+98
* xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-071-2/+2
* Fix warnings on 64-bit windows buildsRussell Belfer2012-04-171-3/+3
* Import xdiff library from gitRussell Belfer2012-03-021-0/+619